migrate check (#33)

Author: frf12

_cmd.py

@@ -352,7 +352,7 @@ def __init__(self):
         self.parser.add_option('-c', '--config', type='string', help="Path to the configuration yaml file.")
         self.parser.add_option('-f', '--force', action='store_true', help="Force deploy, overwrite the home_path.", default=False)
         self.parser.add_option('-U', '--unuselibrepo', '--ulp', action='store_true', help="Disable OBD from installing the libs mirror automatically.")
-        self.parser.add_option('-A', '--auto-create-tenant', '--act', action='store_false', help="Disable OBD from creating a tenant named `test` by using all the available resource of the cluster.")
+        self.parser.add_option('-A', '--auto-create-tenant', '--act', action='store_true', help="Disable OBD from creating a tenant named `test` by using all the available resource of the cluster.")
         # self.parser.add_option('-F', '--fuzzymatch', action='store_true', help="enable fuzzy match when search package")
 
     def _do_command(self, obd):

plugins/mysqltest/3.1.0/init_sql/init_tenant.sql

@@ -22,6 +22,7 @@
 
 
 import re
+import time
 
 
 def parse_size(size):
@@ -108,6 +109,24 @@ def exception(*arg, **kwargs):
     if unit_num > min_unit_num:
         return error('resource pool unit num is bigger than zone server count')
 
+    sql = "select count(*) num from oceanbase.__all_server where status = 'active' and start_service_time > 0"
+    try:
+        count = 30
+        while count:
+            stdio.verbose('execute sql: %s' % sql)
+            cursor.execute(sql)
+            num = cursor.fetchone()['num']
+            if num >= unit_num:
+                break
+            count -= 1
+            time.sleep(1)
+        if count == 0:
+            stdio.error('server can not migrate in')
+            return
+    except:
+        exception('execute sql exception: %s' % sql)
+        return
+    
     cpu_total = 0
     mem_total = 0
     disk_total = 0