Change tidb's lease time to the default value and refine doc (#1385)

docs/ssm-deployment-guide.md

@@ -80,12 +80,12 @@ Configure SSM
 
 * **Configure database**
 
-   MySQL or SQLite can be used to store metadata for SSM. Alternatively, you can just enable TiDB integrated with SSM.
+   MySQL or SQLite can be used to store metadata for SSM. Alternatively, you can just enable TiDB (rc4 version) which has been integrated with SSM.
    TiDB is a distributed NewSQL database, which can provide good scalability and high availability for SSM.
 
    You just need to follow the guide in one of the two following options to configure database for SSM.
 
-   Option 1. Use MySQL/SQLite
+   * Option 1. Use MySQL/SQLite
 
     You need to install a MySQL or SQLite instance first. Open conf/druid.xml, configure how SSM can access MySQL DB. Basically filling out the jdbc url, username and password are enough.
     Please be noted that, security support will be enabled later. Here is an example for MySQL,
@@ -101,7 +101,7 @@ Configure SSM
 
    `ssm` is the database name. User needs to create it manually through MySQL client.
 
-   Option 2. Use SSM-TiDB
+   * Option 2. Use SSM-TiDB
 
     Since TiDB has been integrated with SSM, you do not need to install TiDB beforehand.
     TiDB can be enabled in smart-site.xml.

smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/agent/messages/MasterToAgent.java

@@ -93,7 +93,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-      return "AgentRegistered{ id=" + id + "}";
+      return "AgentRegistered{id=" + id + "}";
     }
   }
 

smart-server/src/main/java/org/smartdata/server/SmartServer.java

@@ -161,7 +161,7 @@ public static void startDB(SmartConf conf, AgentMaster agentMaster)
         Thread.sleep(100);
       }
       LOG.info("Tikv server is ready.");
-      String tidbArgs = String.format("--store=tikv --path=%s:2379 --lease=1s", host);
+      String tidbArgs = String.format("--store=tikv --path=%s:2379 --lease=10s", host);
       TidbServer tidbServer = new TidbServer(tidbArgs, conf);
       Thread tidbThread = new Thread(tidbServer);
       tidbThread.start();

smart-tidb/src/main/java/org/smartdata/tidb/LaunchDB.java

@@ -32,7 +32,7 @@ public LaunchDB(SmartConf conf) {
     String pdArgs = "--data-dir=pd";
     String tikvArgs = "--pd=127.0.0.1:2379 --data-dir=tikv";
     //The default lease time is 10s. Setting a smaller value may decrease the time of executing ddl statement, but it's dangerous to do so.
-    String tidbArgs = "--store=tikv --path=127.0.0.1:2379 --lease=1s";
+    String tidbArgs = "--store=tikv --path=127.0.0.1:2379 --lease=10s";
     //String tidbArgs = new String("--log-file=logs/tidb.log");
 
     pdServer = new PdServer(pdArgs, conf);

supports/integration-test/Disaster_Recovery_Performance_Test.md

@@ -37,11 +37,10 @@ python reset_env.py ResetEnv.test_create_1000_100MB
 These commands will create 10K * 1MB in `1MB`, 10K * 10MB in `10MB` and 1K * 100MB in `100MB`.
 
 2. Init/Rest SSM and remote HDFS
-Stop, init and start SSM
+Stop and start SSM with formatting database
 ```
 bin/stop-ssm.sh
-bin/init-ssm.sh
-bin/start-ssm.sh
+bin/start-ssm.sh -format
 ```
 
 [Optional] Remove existing files in test directories of remote cluster:

supports/integration-test/README.md

@@ -31,11 +31,11 @@ HDFS dfs -mkdir /test/
 python reset_env.py -v
 ```
 
-3. Init/Rest SSM
+3. Stop and start SSM with formatting database
+
 ```
 bin/stop-ssm.sh
-bin/init-ssm.sh
-bin/start-ssm.sh
+bin/start-ssm.sh -format
 ```
 
 ## Run Test Scripts