Преглед на файлове

etcdctl: log more about sync process

Users don't even know that etcdctl is doing sync and fails on sync
process. So we add more logs for sync process.
Yicheng Qin преди 10 години
родител
ревизия
8e040efed9
променени са 1 файла, в които са добавени 12 реда и са изтрити 2 реда
  1. 12 2
      etcdctl/command/util.go

+ 12 - 2
etcdctl/command/util.go

@@ -187,7 +187,15 @@ func mustNewClient(c *cli.Context) client.Client {
 		os.Exit(1)
 		os.Exit(1)
 	}
 	}
 
 
+	debug := c.GlobalBool("debug")
+	if debug {
+		client.EnablecURLDebug()
+	}
+
 	if !c.GlobalBool("no-sync") {
 	if !c.GlobalBool("no-sync") {
+		if debug {
+			fmt.Fprintf(os.Stderr, "start to sync cluster using endpoints(%s)\n", strings.Join(hc.Endpoints(), ","))
+		}
 		ctx, cancel := context.WithTimeout(context.Background(), client.DefaultRequestTimeout)
 		ctx, cancel := context.WithTimeout(context.Background(), client.DefaultRequestTimeout)
 		err := hc.Sync(ctx)
 		err := hc.Sync(ctx)
 		cancel()
 		cancel()
@@ -199,11 +207,13 @@ func mustNewClient(c *cli.Context) client.Client {
 			handleError(ExitServerError, err)
 			handleError(ExitServerError, err)
 			os.Exit(1)
 			os.Exit(1)
 		}
 		}
+		if debug {
+			fmt.Fprintf(os.Stderr, "got endpoints(%s) after sync\n", strings.Join(hc.Endpoints(), ","))
+		}
 	}
 	}
 
 
-	if c.GlobalBool("debug") {
+	if debug {
 		fmt.Fprintf(os.Stderr, "Cluster-Endpoints: %s\n", strings.Join(hc.Endpoints(), ", "))
 		fmt.Fprintf(os.Stderr, "Cluster-Endpoints: %s\n", strings.Join(hc.Endpoints(), ", "))
-		client.EnablecURLDebug()
 	}
 	}
 
 
 	return hc
 	return hc