*: tiny updates, more logs

Author: spinlock

cmd/dashboard/main.go

@@ -25,7 +25,7 @@ import (
 func main() {
 	const usage = `
 Usage:
-	codis-dashboard [--ncpu=N] [--config=CONF] [--log=FILE] [--log-level=LEVEL] [--host-admin=ADDR] [--zookeeper=ADDR|--etcd=ADDR|--filesystem=ROOT] [--product_name=NAME] [--product_auth=AUTH] [--pidfile=FILE] [--remove-lock]
+	codis-dashboard [--ncpu=N] [--config=CONF] [--log=FILE] [--log-level=LEVEL] [--host-admin=ADDR] [--pidfile=FILE] [--zookeeper=ADDR|--etcd=ADDR|--filesystem=ROOT] [--product_name=NAME] [--product_auth=AUTH] [--remove-lock]
 	codis-dashboard  --default-config
 	codis-dashboard  --version
 
@@ -92,17 +92,23 @@ Options:
 	case d["--zookeeper"] != nil:
 		config.CoordinatorName = "zookeeper"
 		config.CoordinatorAddr = utils.ArgumentMust(d, "--zookeeper")
+		log.Warnf("option --zookeeper = %s", config.CoordinatorAddr)
+
 	case d["--etcd"] != nil:
 		config.CoordinatorName = "etcd"
 		config.CoordinatorAddr = utils.ArgumentMust(d, "--etcd")
+		log.Warnf("option --etcd = %s", config.CoordinatorAddr)
+
 	case d["--filesystem"] != nil:
 		config.CoordinatorName = "filesystem"
 		config.CoordinatorAddr = utils.ArgumentMust(d, "--filesystem")
+		log.Warnf("option --filesystem = %s", config.CoordinatorAddr)
+
 	}
 
 	if s, ok := utils.Argument(d, "--product_name"); ok {
 		config.ProductName = s
-		log.Warnf("option --product_nam = %s", s)
+		log.Warnf("option --product_name = %s", s)
 	}
 	if s, ok := utils.Argument(d, "--product_auth"); ok {
 		config.ProductAuth = s

cmd/ha/main.go

@@ -66,9 +66,9 @@ Options:
 	log.Warnf("set dashboard = %s", dashboard)
 	log.Warnf("set interval = %d (seconds)", interval)
 
-	var noMaintains = false
+	var maintains = true
 	if d["--no-maintains"].(bool) {
-		noMaintains = true
+		maintains = false
 	}
 
 	client := topom.NewApiClient(dashboard)
@@ -91,7 +91,7 @@ Options:
 		hc := newHealthyChecker(client)
 		hc.LogProxyStats()
 		hc.LogGroupStats()
-		if !noMaintains {
+		if maintains {
 			hc.Maintains(client, interval*10, prodcutAuth)
 		}
 

cmd/proxy/main.go

@@ -31,7 +31,7 @@ import (
 func main() {
 	const usage = `
 Usage:
-	codis-proxy [--ncpu=N [--max-ncpu=MAX]] [--config=CONF] [--log=FILE] [--log-level=LEVEL] [--host-admin=ADDR] [--host-proxy=ADDR] [--dashboard=ADDR|--zookeeper=ADDR|--etcd=ADDR|--filesystem=ROOT|--fillslots=FILE] [--ulimit=NLIMIT] [--product_name=NAME] [--product_auth=AUTH] [--pidfile=FILE]
+	codis-proxy [--ncpu=N [--max-ncpu=MAX]] [--config=CONF] [--log=FILE] [--log-level=LEVEL] [--host-admin=ADDR] [--host-proxy=ADDR] [--dashboard=ADDR|--zookeeper=ADDR|--etcd=ADDR|--filesystem=ROOT|--fillslots=FILE] [--ulimit=NLIMIT] [--pidfile=FILE] [--product_name=NAME] [--product_auth=AUTH] [--session_auth=AUTH]
 	codis-proxy  --default-config
 	codis-proxy  --version
 
@@ -166,12 +166,16 @@ Options:
 
 	if s, ok := utils.Argument(d, "--product_name"); ok {
 		config.ProductName = s
-		log.Warnf("option --product_nam = %s", s)
+		log.Warnf("option --product_name = %s", s)
 	}
 	if s, ok := utils.Argument(d, "--product_auth"); ok {
 		config.ProductAuth = s
 		log.Warnf("option --product_auth = %s", s)
 	}
+	if s, ok := utils.Argument(d, "--session_auth"); ok {
+		config.SessionAuth = s
+		log.Warnf("option --session_auth = %s", s)
+	}
 
 	s, err := proxy.New(config)
 	if err != nil {

kubernetes/start.sh

@@ -59,7 +59,7 @@ scale-server)
         while [ $(kubectl get pods -l app=codis-server |grep Running |wc -l) != $2 ]; do sleep 1; done;
         kubectl exec -it codis-server-0 -- codis-admin  --dashboard=codis-dashboard:18080 --rebalance --confirm
     else
-        echo "reduce the number of codis-server, does not support, plz wait"
+        echo "reduce the number of codis-server, does not support, please wait"
         # while [ $cur > $des ]
         # do
         #    cur=`expr $cur - 2`
@@ -72,11 +72,10 @@ scale-server)
         # kubectl scale statefulsets codis-server --replicas=$des
         # kubectl exec -it codis-server-0 -- codis-admin  --dashboard=codis-dashboard:18080 --rebalance --confirm
     fi
-
-    ;;    
+    ;;
 
 *)
     echo "wrong argument(s)"
     ;;
 
-esac
+esac