From 6f6427b0e38eecaad573bfea13e40ed54572bb77 Mon Sep 17 00:00:00 2001 From: kmetin Date: Mon, 6 Nov 2023 14:38:52 +0300 Subject: [PATCH] fix --- base/commands/migration/migration_stages.go | 23 ++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/base/commands/migration/migration_stages.go b/base/commands/migration/migration_stages.go index aa7300c1..3e7a155f 100644 --- a/base/commands/migration/migration_stages.go +++ b/base/commands/migration/migration_stages.go @@ -30,6 +30,8 @@ var migrationStatusNotFoundErr = fmt.Errorf("migration status not found") var migrationReportNotFoundErr = "migration report cannot be found: %w" +var noDataStructuresFoundErr = errors.New("no datastructures found to migrate") + var progressMsg = "Migrating %s: %s" func createMigrationStages(ctx context.Context, ec plug.ExecContext, ci *hazelcast.ClientInternal, migrationID string) ([]stage.Stage[any], error) { @@ -154,12 +156,15 @@ func getDataStructuresToBeMigrated(ctx context.Context, ec plug.ExecContext, mig if err != nil { return nil, err } + if rr == nil { + return nil, noDataStructuresFoundErr + } var status OverallMigrationStatus if err = json.Unmarshal(rr.(serialization.JSON), &status); err != nil { return nil, err } if len(status.Migrations) == 0 { - return nil, errors.New("no datastructures found to migrate") + return nil, noDataStructuresFoundErr } for _, m := range status.Migrations { dss = append(dss, DataStructureInfo{ @@ -254,6 +259,9 @@ func fetchMigrationStatus(ctx context.Context, ci *hazelcast.ClientInternal, mig if err != nil { return "", migrationStatusNotFoundErr } + if rr == nil { + return "", migrationStatusNotFoundErr + } return strings.TrimSuffix(strings.TrimPrefix(string(rr.(serialization.JSON)), `"`), `"`), nil } @@ -263,6 +271,9 @@ func fetchOverallProgress(ctx context.Context, ci *hazelcast.ClientInternal, mig if err != nil { return 0, 0, err } + if r == nil { + return 0, 0, errors.New("overall progress not found") + } remainingTime, err := r.Get(0) if err != nil { return 0, 0, err @@ -295,6 +306,9 @@ func fetchMigrationReport(ctx context.Context, ci *hazelcast.ClientInternal, mig if err != nil { return "", fmt.Errorf(migrationReportNotFoundErr, err) } + if r == nil { + return "", errors.New("migration report not found") + } rr, err := r.Get(0) if err != nil { return "", fmt.Errorf(migrationReportNotFoundErr, err) @@ -310,6 +324,9 @@ func fetchMigrationErrors(ctx context.Context, ci *hazelcast.ClientInternal, mig if err != nil { return "", err } + if r == nil { + return "", errors.New("could not fetch migration errors") + } rr, err := r.Get(0) if err != nil { return "", err @@ -362,6 +379,10 @@ func maybePrintWarnings(ctx context.Context, ec plug.ExecContext, ci *hazelcast. ec.Logger().Error(err) return } + if r == nil { + ec.Logger().Info("could not find any warnings") + return + } rr, err := r.Get(0) if err != nil { ec.Logger().Error(err)