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 BlobStorage use different broker in a client request bug #48856

Merged
merged 1 commit into from
Jul 25, 2024

Conversation

HangyuanLiu
Copy link
Contributor

@HangyuanLiu HangyuanLiu commented Jul 24, 2024

Why I'm doing:

PR #48292 introduced a bug. If there is no corresponding broker locally, getBroker will return an available broker at random. However, we must ensure that multiple requests for one operation are sent to the same broker.

What I'm doing:

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

@HangyuanLiu HangyuanLiu requested a review from a team as a code owner July 24, 2024 11:53
@@ -770,7 +785,7 @@ public Status checkPathExist(String remotePath) {

TBrokerCheckPathExistResponse rep = ThriftRPCRequestExecutor.callNoRetry(
ThriftConnectionPool.brokerPool,
getBrokerAddress(),
address,
client -> client.checkPathExist(req));

TBrokerOperationStatus opst = rep.getOpStatus();
Copy link

Choose a reason for hiding this comment

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

The most risky bug in this code is:
Inconsistent broker address variable name in the checkPathExist method.

You can modify the code like this:

@@ -762,7 +776,7 @@ public Status checkPathExist(String remotePath) {
         if (!hasBroker) {
             return checkPathExistWithoutBroker(remotePath);
         }
+        TNetworkAddress brokerAddress = getBrokerAddress();
 
         // check path
         try {
@@ -770,7 +785,7 @@ public Status checkPathExist(String remotePath) {
 
             TBrokerCheckPathExistResponse rep = ThriftRPCRequestExecutor.callNoRetry(
                     ThriftConnectionPool.brokerPool,
-                    getBrokerAddress(),  // Incorrect variable name here
+                    brokerAddress,       // Consistent with the rest of the code
                     client -> client.checkPathExist(req));
 
             TBrokerOperationStatus opst = rep.getOpStatus();

Copy link

sonarcloud bot commented Jul 24, 2024

Copy link

[FE Incremental Coverage Report]

fail : 2 / 12 (16.67%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/backup/BlobStorage.java 2 12 16.67% [159, 308, 403, 408, 433, 457, 461, 555, 632, 678]

Copy link

[BE Incremental Coverage Report]

pass : 0 / 0 (0%)

@github-actions github-actions bot added the 3.3 label Jul 25, 2024
@wanpengfei-git wanpengfei-git merged commit 72e4bf5 into StarRocks:main Jul 25, 2024
70 of 75 checks passed
Copy link

@Mergifyio backport branch-3.3

@github-actions github-actions bot removed the 3.3 label Jul 25, 2024
Copy link
Contributor

mergify bot commented Jul 25, 2024

backport branch-3.3

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jul 25, 2024
wanpengfei-git pushed a commit that referenced this pull request Jul 26, 2024
dujijun007 pushed a commit to dujijun007/starrocks that referenced this pull request Jul 29, 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.

4 participants