Dev: Remove unused code (#1863)

Author: liangxin1300

crmsh/log_patterns.py

@@ -25,122 +25,6 @@
 
 __all__ = ('patterns',)
 
-_patterns_old = {
-    "resource": (
-        (  # detail 0
-            "lrmd.*%% (?:start|stop|promote|demote|migrate)",
-            "lrmd.*RA output: .%%:.*:stderr",
-            "lrmd.*WARN: Managed %%:.*exited",
-            "lrmd.*WARN: .* %% .*timed out$",
-            "crmd.*LRM operation %%_(?:start|stop|promote|demote|migrate)_.*confirmed=true",
-            "crmd.*LRM operation %%_.*Timed Out",
-            "[(]%%[)]\\[",
-        ),
-        (  # detail 1
-            "lrmd.*%% (?:probe|notify)",
-            "lrmd.*Managed %%:.*exited",
-        ),
-    ),
-    "node": (
-        (  # detail 0
-            " %% .*Corosync.Cluster.Engine",
-            " %% .*Executive.Service.RELEASE",
-            " %% .*Requesting.shutdown",
-            " %% .*Shutdown.complete",
-            " %% .*Configuration.validated..Starting.heartbeat",
-            "pengine.*Scheduling Node %% for STONITH",
-            "crmd.* of %% failed",
-            "stonith-ng.*host '%%'",
-            "Exec.*on %% ",
-            "Node %% will be fenced",
-            "stonith-ng.*for %% timed",
-            "stonith-ng.*can not fence %%:",
-            "stonithd.*Succeeded.*node %%:",
-            "(?:lost|memb): %% ",
-            "crmd.*(?:NEW|LOST):.* %% ",
-            "Node return implies stonith of %% ",
-        ),
-        (  # detail 1
-        ),
-    ),
-    "quorum": (
-        (  # detail 0
-            "crmd.*Updating.quorum.status",
-            "crmd.*quorum.(?:lost|ac?quir)",
-        ),
-        (  # detail 1
-        ),
-    ),
-    "events": (
-        (  # detail 0
-            "CRIT:",
-            "ERROR:",
-        ),
-        (  # detail 1
-            "WARN:",
-        ),
-    ),
-}
-
-_patterns_118 = {
-    "resource": (
-        (  # detail 0
-            "crmd.*Initiating.*%%_(?:start|stop|promote|demote|migrate)_",
-            "lrmd.*operation_finished: %%_",
-            "lrmd.*executing - rsc:%% action:(?:start|stop|promote|demote|migrate)",
-            "lrmd.*finished - rsc:%% action:(?:start|stop|promote|demote|migrate)",
-
-            "crmd.*LRM operation %%_(?:start|stop|promote|demote|migrate)_.*confirmed=true",
-            "crmd.*LRM operation %%_.*Timed Out",
-            "[(]%%[)]\\[",
-        ),
-        (  # detail 1
-            "crmd.*Initiating.*%%_(?:monitor_0|notify)",
-            "lrmd.*executing - rsc:%% action:(?:monitor_0|notify)",
-            "lrmd.*finished - rsc:%% action:(?:monitor_0|notify)",
-        ),
-    ),
-    "node": (
-        (  # detail 0
-            " %% .*Corosync.Cluster.Engine",
-            " %% .*Executive.Service.RELEASE",
-            " %% .*crm_shutdown:.Requesting.shutdown",
-            " %% .*pcmk_shutdown:.Shutdown.complete",
-            " %% .*Configuration.validated..Starting.heartbeat",
-            "pengine.*Scheduling Node %% for STONITH",
-            "pengine.*Node %% will be fenced",
-            "crmd.*for %% failed",
-            "stonith-ng.*host '%%'",
-            "Exec.*on %% ",
-            "Node %% will be fenced",
-            "stonith-ng.*on %% for.*timed out",
-            "stonith-ng.*can not fence %%:",
-            "stonithd.*Succeeded.*node %%:",
-            "(?:lost|memb): %% ",
-            "crmd.*(?:NEW|LOST|new|lost):.* %% ",
-            "Node return implies stonith of %% ",
-        ),
-        (  # detail 1
-        ),
-    ),
-    "quorum": (
-        (  # detail 0
-            "crmd.*Updating.(quorum).status",
-            r"crmd.*quorum.(?:lost|ac?quir[^\s]*)",
-        ),
-        (  # detail 1
-        ),
-    ),
-    "events": (
-        (  # detail 0
-            "(CRIT|crit|ERROR|error|UNCLEAN|unclean):",
-        ),
-        (  # detail 1
-            "(WARN|warning):",
-        ),
-    ),
-}
-
 _patterns_200 = {
     "resource": (
         (  # detail 0
@@ -280,8 +164,3 @@
 def patterns(cib_f=None):
     if utils.is_min_pcmk_ver(constants.PCMK_VERSION_DEFAULT, cib_f=cib_f):
         return _patterns_200
-    is118 = utils.is_larger_than_pcmk_118(cib_f=cib_f)
-    if is118:
-        return _patterns_118
-    else:
-        return _patterns_old

crmsh/ui_node.py

@@ -257,19 +257,7 @@ class NodeMgmt(command.UI):
     node_delete = """cibadmin -D -o nodes -X '<node uname="%s"/>'"""
     node_delete_status = """cibadmin -D -o status -X '<node_state uname="%s"/>'"""
     node_cleanup_resources = "crm_resource --cleanup --node '%s'"
-    node_clear_state = _oneline("""cibadmin %s
-      -o status --xml-text
-      '<node_state id="%s"
-                   uname="%s"
-                   ha="active"
-                   in_ccm="false"
-                   crmd="offline"
-                   join="member"
-                   expected="down"
-                   crm-debug-origin="manual_clear"
-                   shutdown="0"
-       />'""")
-    node_clear_state_118 = "stonith_admin --confirm %s"
+    node_clear_state = "stonith_admin --confirm %s"
     crm_node = "crm_node"
     node_fence = "crm_attribute -t status -N '%s' -n terminate -v true"
     dc = "crmadmin -D"
@@ -489,24 +477,21 @@ def do_clearstate(self, context, node=None):
         if not config.core.force and \
                 not utils.ask("Do you really want to drop state for node %s?" % node):
             return False
-        if utils.is_larger_than_pcmk_118():
-            cib_elem = xmlutil.cibdump2elem()
-            if cib_elem is None:
-                return False
-            crmd = cib_elem.xpath("//node_state[@uname=\"%s\"]/@crmd" % node)
-            if not crmd:
-                logger.error("Node '%s' not found in CIB", node)
-                return False
-            if crmd == ["online"] or (crmd[0].isdigit() and int(crmd[0]) != 0):
-                return utils.ext_cmd(self.node_cleanup_resources % node) == 0
-            in_ccm = cib_elem.xpath("//node_state[@uname=\"%s\"]/@in_ccm" % node)
-            if in_ccm == ["true"] or (in_ccm[0].isdigit() and int(in_ccm[0]) != 0):
-                logger.warning("Node is offline according to Pacemaker, but online according to corosync. First shut down node '%s'", node)
-                return False
-            return utils.ext_cmd(self.node_clear_state_118 % node) == 0
-        else:
-            return utils.ext_cmd(self.node_clear_state % ("-M -c", node, node)) == 0 and \
-                utils.ext_cmd(self.node_clear_state % ("-R", node, node)) == 0
+
+        cib_elem = xmlutil.cibdump2elem()
+        if cib_elem is None:
+            return False
+        crmd = cib_elem.xpath("//node_state[@uname=\"%s\"]/@crmd" % node)
+        if not crmd:
+            logger.error("Node '%s' not found in CIB", node)
+            return False
+        if crmd == ["online"] or (crmd[0].isdigit() and int(crmd[0]) != 0):
+            return utils.ext_cmd(self.node_cleanup_resources % node) == 0
+        in_ccm = cib_elem.xpath("//node_state[@uname=\"%s\"]/@in_ccm" % node)
+        if in_ccm == ["true"] or (in_ccm[0].isdigit() and int(in_ccm[0]) != 0):
+            logger.warning("Node is offline according to Pacemaker, but online according to corosync. First shut down node '%s'", node)
+            return False
+        return utils.ext_cmd(self.node_clear_state % node) == 0
 
     @classmethod
     def call_delnode(cls, node):

crmsh/utils.py

@@ -1639,10 +1639,6 @@ def is_min_pcmk_ver(min_ver, cib_f=None):
     return is_larger_than_min_version(constants.pcmk_version, min_ver)
 
 
-def is_larger_than_pcmk_118(cib_f=None):
-    return is_min_pcmk_ver("1.1.8", cib_f=cib_f)
-
-
 # quote function from python module shlex.py in python 3.3
 
 _find_unsafe = re.compile(r'[^\w@%+=:,./-]').search