From 951aa8e69a71789097b95136853a776a970ac0cf Mon Sep 17 00:00:00 2001
From: hwdef <hwdef97@gmail.com>
Date: Sat, 14 Sep 2019 19:12:48 +0800
Subject: [PATCH] add-err-handling-in-images/etcd/migrate

---
 cluster/images/etcd/migrate/data_dir_test.go | 5 ++++-
 cluster/images/etcd/migrate/migrate.go       | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cluster/images/etcd/migrate/data_dir_test.go b/cluster/images/etcd/migrate/data_dir_test.go
index cd8efd0b0f2..23081ca8a1b 100644
--- a/cluster/images/etcd/migrate/data_dir_test.go
+++ b/cluster/images/etcd/migrate/data_dir_test.go
@@ -151,9 +151,12 @@ func TestBackup(t *testing.T) {
 
 func newTestPath(t *testing.T) string {
 	path, err := ioutil.TempDir("", "etcd-migrate-test-")
-	os.Chmod(path, 0777)
 	if err != nil {
 		t.Fatalf("Failed to create tmp dir for test: %v", err)
 	}
+	err = os.Chmod(path, 0777)
+	if err != nil {
+		t.Fatalf("Failed to granting permission to tmp dir for test: %v", err)
+	}
 	return path
 }
diff --git a/cluster/images/etcd/migrate/migrate.go b/cluster/images/etcd/migrate/migrate.go
index 4c7017dd406..706f06b7f80 100644
--- a/cluster/images/etcd/migrate/migrate.go
+++ b/cluster/images/etcd/migrate/migrate.go
@@ -77,7 +77,10 @@ func main() {
 	flags.StringVar(&opts.targetVersion, "target-version", "", "version of etcd to migrate to. Format must be '<major>.<minor>.<patch>'")
 	flags.StringVar(&opts.targetStorage, "target-storage", "", "storage version of etcd to migrate to, one of: etcd2, etcd3")
 	flags.StringVar(&opts.etcdServerArgs, "etcd-server-extra-args", "", "additional etcd server args for starting etcd servers during migration steps, --peer-* TLS cert flags should be added for etcd clusters with more than 1 member that use mutual TLS for peer communication.")
-	migrateCmd.Execute()
+	err := migrateCmd.Execute()
+	if err != nil {
+		fmt.Printf("Failed to execute migratecmd: %s", err)
+	}
 }
 
 // runMigrate validates the command line flags and starts the migration.