Fix issue 414 CLC-418 #417
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…es to failed state in WaitForMigrationToBeInProgress
sumnerib
approved these changes
Oct 26, 2023
srknzl
commented
Oct 27, 2023
| _ "github.com/hazelcast/hazelcast-commandline-client/base" | ||
| _ "github.com/hazelcast/hazelcast-commandline-client/base/commands" | ||
| "github.com/hazelcast/hazelcast-commandline-client/base/commands/migration" | ||
| "github.com/hazelcast/hazelcast-commandline-client/clc/paths" | ||
| . "github.com/hazelcast/hazelcast-commandline-client/internal/check" | ||
| "github.com/hazelcast/hazelcast-commandline-client/internal/it" | ||
| hz "github.com/hazelcast/hazelcast-go-client" | ||
| "github.com/hazelcast/hazelcast-go-client/serialization" | ||
| "github.com/stretchr/testify/require" |
There was a problem hiding this comment.
this is done by goland automatically and I can't prevent it doing that :D
| errs, err := fetchMigrationErrors(ctx, ci, migrationID) | ||
| if err != nil { | ||
| return fmt.Errorf("migration failed and dmt cannot fetch migration errors: %w", err) | ||
| } else { |
There was a problem hiding this comment.
else is not necessary.
| @@ -235,7 +243,7 @@ func fetchMigrationReport(ctx context.Context, ci *hazelcast.ClientInternal, mig | |||
| } | |||
|
|
|||
| func fetchMigrationErrors(ctx context.Context, ci *hazelcast.ClientInternal, migrationID string) (string, error) { | |||
| q := fmt.Sprintf(`SELECT JSON_QUERY(this, '$.errors') FROM %s WHERE __key='%s'`, StatusMapName, migrationID) | |||
| q := fmt.Sprintf(`SELECT JSON_QUERY(this, '$.errors' WITH WRAPPER) FROM %s WHERE __key='%s'`, StatusMapName, migrationID) | |||
There was a problem hiding this comment.
What is WITH WRAPPER ?
There was a problem hiding this comment.
yuce
requested changes
Oct 30, 2023
| errs, err := fetchMigrationErrors(ctx, ci, migrationID) | ||
| if err != nil { | ||
| return fmt.Errorf("migration failed and dmt cannot fetch migration errors: %w", err) | ||
| } else { |
| @@ -42,7 +43,7 @@ func TestMigrationStages(t *testing.T) { | |||
| "testdata/start/migration_success_initial.json", | |||
| "testdata/start/migration_success_failure.json", | |||
| }, | |||
| expectedErr: errors.New("Failed migrating IMAP: imap5: some error"), | |||
| expectedErr: errors.New("Failed migrating IMAP: imap5: [\"some error\"]"), | |||
There was a problem hiding this comment.
I think this error message is not optimal.
Can't we keep the original string?
There was a problem hiding this comment.
I would rewrite fetchMigrationErrors function like:
func fetchMigrationErrors(ctx context.Context, ci *hazelcast.ClientInternal, migrationID string) (string, error) {
q := fmt.Sprintf(`SELECT JSON_QUERY(this, '$.errors' WITH WRAPPER) FROM %s WHERE __key='%s'`, StatusMapName, migrationID)
row, err := querySingleRow(ctx, ci, q)
if err != nil {
return "", err
}
// ex. converts ["some error", "another error"] -> some error\nanother error
r := strings.Split(
strings.ReplaceAll(
strings.ReplaceAll(
strings.ReplaceAll(string(row.(serialization.JSON)), `"`, ``),
"[", ""),
"]", ""),
",")
return strings.Join(r, "\n"), nil
}
There was a problem hiding this comment.
If it is possible to iterate errors it would be more convenient of course.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #414
Adds the logic of throwing the error if migration becomes failed in WaitForMigrationToBeInProgress.
JSON queries that are expected to return an array should use WITH WRAPPER (see https://docs.hazelcast.com/hazelcast/5.3/sql/working-with-json), I fixed that as well.