Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BugFix] Fix restore download failure for the file of GIN #44957

Merged
merged 3 commits into from
Apr 29, 2024

Conversation

srlch
Copy link
Contributor

@srlch srlch commented Apr 29, 2024

Why I'm doing:

Currently, we hard code two kinds of GIN index file which is end with segments_2 and segments.gen. But the index file maybe contains some file which are end with segments_1, segments_2,...,segments_n etc. We will download these files fail because the incorrent file name check.

What I'm doing:

Check whether the file name contain segments instead of hard coding the suffix

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

Why I'm doing:
Currently, we hard core two kinds of GIN index file which
is end with segments_2 and segments.gen. But the index file
maybe contains some file which are end with segments_1,
segments_2,...,segments_n etc. We will download these files
fail because the incorrent file name check.

What I'm doing:
Check whether the file name contain segments instead of hard
coding the suffix.

Signed-off-by: srlch <linzichao@starrocks.com>
Signed-off-by: srlch <linzichao@starrocks.com>
Comment on lines 760 to 763
if (str.find(match) != std::string::npos) {
return true;
}
return false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (str.find(match) != std::string::npos) {
return true;
}
return false;
return str.find(match) != std::string::npos;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix it

Signed-off-by: srlch <linzichao@starrocks.com>
Copy link

[FE Incremental Coverage Report]

pass : 0 / 0 (0%)

Copy link

[BE Incremental Coverage Report]

pass : 3 / 3 (100.00%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 be/src/runtime/snapshot_loader.cpp 3 3 100.00% []

@wyb wyb enabled auto-merge (squash) April 29, 2024 07:25
@wyb wyb merged commit c2503b7 into StarRocks:main Apr 29, 2024
51 of 52 checks passed
Copy link

@Mergifyio backport branch-3.3

@github-actions github-actions bot removed the 3.3 label Apr 29, 2024
Copy link
Contributor

mergify bot commented Apr 29, 2024

backport branch-3.3

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Apr 29, 2024
Signed-off-by: srlch <linzichao@starrocks.com>
(cherry picked from commit c2503b7)
andyziye pushed a commit that referenced this pull request Apr 29, 2024
…44957) (#44972)

Co-authored-by: srlch <111035020+srlch@users.noreply.github.com>
srlch added a commit to srlch/starrocks that referenced this pull request Apr 30, 2024
This pr is very similar with pr(StarRocks#44957). In StarRocks#44957, we fix
the problem for download procedure. In this pr, we fix the
problem for rename procedure for restore.

Signed-off-by: srlch <linzichao@starrocks.com>
node pushed a commit to vivo/starrocks that referenced this pull request May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants