fixKeeper.py support hetero

ctripcorp · Nov 13, 2024 · 7c5eb1f · 7c5eb1f
1 parent 07d0207
commit 7c5eb1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/redis/package/redis-keeper-package/src/main/scripts/tools/KeeperFix.md b/redis/package/redis-keeper-package/src/main/scripts/tools/KeeperFix.md
@@ -4,7 +4,7 @@
 
 KeeperFix是一个通过替换keeper一键修复XPipe问题集群的脚本
 
-使用前需要替换脚本里的Cookie、XPIPE_HOST，并安装有python2.7
+使用前需要替换脚本里的Cookie、XPIPE_HOST，并安装有python3
 
 ## 功能&使用
 

diff --git a/redis/package/redis-keeper-package/src/main/scripts/tools/KeeperFix.py b/redis/package/redis-keeper-package/src/main/scripts/tools/KeeperFix.py
@@ -114,7 +114,7 @@ def fixCluster(cluster):
     if 'clusterType' not in clusterInfo.keys():
         print("unfind cluster %s skip"%cluster)
         return
-    if (clusterInfo.get('clusterType').lower() != 'one_way'):
+    if (clusterInfo.get('clusterType').lower() not in ['one_way', 'hetero']):
         print("cluster not one_way cluster, skip")
         return
 
@@ -168,7 +168,7 @@ def getActiveKeepers(cluster, dc):
 
 def chooseKeeperPort(keeperIp):
     global useKeeperPorts
-    if not useKeeperPorts.has_key(keeperIp):
+    if keeperIp not in useKeeperPorts:
         useKeeperPorts[keeperIp] = KEEPER_PORT_INIT
         return KEEPER_PORT_INIT
     else:
@@ -180,7 +180,7 @@ def existKeeper(keeperIp, keeperPort):
         "host":keeperIp,
         "port":keeperPort
     }).json()
-    return res.has_key("payload") and res.get("payload")
+    return "payload" in res and res.get("payload")
 
 def strictReplaceShardKeeper(cluster, dc, shard, shardInfo, availableKeepers):
     newKeepers = []
@@ -235,7 +235,7 @@ def fixAll():
     refreshUnhealthyInfo()
 
     while True:
-        action = input('''choose action:
+        action = int(input('''choose action:
     [1] refresh unhealthy info
     [2] show all unhealthy clusters
     [3] show cluster unhealthy shards
@@ -245,8 +245,7 @@ def fixAll():
     [21] config strict replace
     [22] config keeper port init
     [0] exit
-''')
-
+'''))
         limit = -1
         if action == 0:
             break
@@ -255,13 +254,13 @@ def fixAll():
         elif action == 2:
             showAllUnhealthyClusters()
         elif action == 3:
-            cluster = raw_input("input cluster name\n")
+            cluster = input("input cluster name\n")
             showAllUnhealthyShards(cluster)
         elif action == 11:
-            cluster = raw_input("input cluster name\n")
+            cluster = input("input cluster name\n")
             fixCluster(cluster)
         elif action == 12:
-            fixlimit = input("input fix limit\n")
+            fixlimit = int(input("input fix limit\n"))
             if fixlimit <= 0:
                 print("fix limit should gt 0")
                 continue
@@ -270,7 +269,7 @@ def fixAll():
         elif action == 13:
             fixAll()
         elif action == 21:
-            inputStrictReplace = input("1 - use strict replace; 0 - use normal strict\n")
+            inputStrictReplace = int(input("1 - use strict replace; 0 - use normal strict\n"))
             if inputStrictReplace == 1:
                 strictReplace = True
             elif inputStrictReplace == 0:
@@ -282,7 +281,7 @@ def fixAll():
             else:
                 print("now use normal replace")
         elif action == 22:
-            inputPortInit = input("input init port\n")
+            inputPortInit = int(input("input init port\n"))
             if inputPortInit <= 0:
                 print("unexpect input %d"%inputPortInit)
                 continue