From 404e09a815d1eca046149110c28bfdb067c40c8a Mon Sep 17 00:00:00 2001
From: Kutluhan Metin <kutluhan.metin@hazelcast.com>
Date: Tue, 14 Nov 2023 15:21:05 +0300
Subject: [PATCH] fix hanging problem without any output (#429)

---
 base/commands/migration/migration_start.go  | 18 +++++++-----------
 base/commands/migration/migration_status.go | 10 +++-------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/base/commands/migration/migration_start.go b/base/commands/migration/migration_start.go
index c11ad5a0..60c3043f 100644
--- a/base/commands/migration/migration_start.go
+++ b/base/commands/migration/migration_start.go
@@ -33,10 +33,6 @@ func (StartCmd) Init(cc plug.InitContext) error {
 }
 
 func (StartCmd) Exec(ctx context.Context, ec plug.ExecContext) (err error) {
-	ci, err := ec.ClientInternal(ctx)
-	if err != nil {
-		return err
-	}
 	ec.PrintlnUnnecessary("")
 	ec.PrintlnUnnecessary(`Hazelcast Data Migration Tool v5.3.0
 (c) 2023 Hazelcast, Inc.
@@ -59,22 +55,22 @@ Selected data structures in the source cluster will be migrated to the target cl
 	}
 	ec.PrintlnUnnecessary("")
 	mID := MigrationIDGeneratorFunc()
+	sts, err := NewStartStages(ec.Logger(), mID, conf)
+	if err != nil {
+		return err
+	}
 	defer func() {
-		maybePrintWarnings(ctx, ec, ci, mID)
-		finalizeErr := finalizeMigration(ctx, ec, ci, mID, ec.Props().GetString(flagOutputDir))
+		maybePrintWarnings(ctx, ec, sts.ci, mID)
+		finalizeErr := finalizeMigration(ctx, ec, sts.ci, mID, ec.Props().GetString(flagOutputDir))
 		if err == nil {
 			err = finalizeErr
 		}
 	}()
-	sts, err := NewStartStages(ec.Logger(), mID, conf)
-	if err != nil {
-		return err
-	}
 	sp := stage.NewFixedProvider(sts.Build(ctx, ec)...)
 	if _, err = stage.Execute(ctx, ec, any(nil), sp); err != nil {
 		return err
 	}
-	mStages, err := createMigrationStages(ctx, ec, ci, mID)
+	mStages, err := createMigrationStages(ctx, ec, sts.ci, mID)
 	if err != nil {
 		return err
 	}
diff --git a/base/commands/migration/migration_status.go b/base/commands/migration/migration_status.go
index 40cf9e71..5d9b75df 100644
--- a/base/commands/migration/migration_status.go
+++ b/base/commands/migration/migration_status.go
@@ -24,10 +24,6 @@ func (s StatusCmd) Init(cc plug.InitContext) error {
 }
 
 func (s StatusCmd) Exec(ctx context.Context, ec plug.ExecContext) (err error) {
-	ci, err := ec.ClientInternal(ctx)
-	if err != nil {
-		return err
-	}
 	ec.PrintlnUnnecessary("")
 	ec.PrintlnUnnecessary(banner)
 	sts := NewStatusStages()
@@ -37,13 +33,13 @@ func (s StatusCmd) Exec(ctx context.Context, ec plug.ExecContext) (err error) {
 		return err
 	}
 	defer func() {
-		maybePrintWarnings(ctx, ec, ci, mID.(string))
-		finalizeErr := finalizeMigration(ctx, ec, ci, mID.(string), ec.Props().GetString(flagOutputDir))
+		maybePrintWarnings(ctx, ec, sts.ci, mID.(string))
+		finalizeErr := finalizeMigration(ctx, ec, sts.ci, mID.(string), ec.Props().GetString(flagOutputDir))
 		if err == nil {
 			err = finalizeErr
 		}
 	}()
-	mStages, err := createMigrationStages(ctx, ec, ci, mID.(string))
+	mStages, err := createMigrationStages(ctx, ec, sts.ci, mID.(string))
 	if err != nil {
 		return err
 	}