Skip to content

[Bug] Fix some bugs#6665

Merged
caiconghui merged 2 commits intoapache:masterfrom
morningman:sandbox_bugs
Sep 17, 2021
Merged

[Bug] Fix some bugs#6665
caiconghui merged 2 commits intoapache:masterfrom
morningman:sandbox_bugs

Conversation

@morningman
Copy link
Contributor

Proposed changes

  1. Fix a potential BE coredump of sending batch when loading data. (Fix [Bug] BE crash when loading data #6656)
  2. Fix a potential BE coredump when doing schema change. (Fix [Bug] BE crash when doing alter task #6657)
  3. Optimize the metric of base_compaction_request_failed.
  4. Add Order column in show tablet result. (Fix [Feature] Add order column in SHOW TABLET stmt result #6658)
  5. Fix bug that tablet repair slot not being released. (Fix [Bug] Tablet scheduler stop working #6659)
  6. Fix bug that REPLICA_MISSING error can not be handled. (Fix [Bug] REPLICA_MISSING error can not be handled. #6660)
  7. Modify column name of SHOW PROC "/cluster_balance/cluster_load_stat"
  8. Optimize the result of SHOW PROC "/statistic" to show COLOCATE_MISMATCH tablets (Fix [Feature] the health status of colocate table's tablet is not shown in show proc statistic #6663)
  9. Fix bug that show load where state='pending' can not be executed. (Fix [Bug] show load where state='pending' can not be executed. #6664)

Types of changes

What types of changes does your code introduce to Doris?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)
  • Code refactor (Modify the code structure, format the code, etc...)
  • Optimization. Including functional usability improvements and performance improvements.
  • Dependency. Such as changes related to third-party components.
  • Other.

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have created an issue on (Fix #ISSUE) and described the bug/feature there in detail
  • Compiling and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • If these changes need document changes, I have updated the document
  • Any dependent changes have been merged

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@morningman morningman added the kind/fix Categorizes issue or PR as related to a bug. label Sep 15, 2021
@morningman
Copy link
Contributor Author

cc @caiconghui #6656

@Override
public int compare(Replica r1, Replica r2) {
long verCount1 = r1.getVersionCount() == -1 ? Integer.MAX_VALUE : r1.getVersionCount();
long verCount2 = r2.getVersionCount() == -1 ? Integer.MAX_VALUE : r2.getVersionCount();
Copy link
Contributor

Choose a reason for hiding this comment

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

Integer.MAX_VALUE -> Long.MAX_VALUE

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is intentional, because compare() return int. If I use Long.MAX_VALUE, it may be overflow.

Copy link
Contributor

Choose a reason for hiding this comment

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

the type of verCount is long, so I think we just need to return 1, -1, 0 to support bigger scope of version count value

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

set_last_base_compaction_failure_time(UnixMillis());
DorisMetrics::instance()->base_compaction_request_failed->increment(1);
if (res != OLAP_ERR_BE_NO_SUITABLE_VERSION) {
DorisMetrics::instance()->base_compaction_request_failed->increment(1);
Copy link
Contributor

@caiconghui caiconghui Sep 15, 2021

Choose a reason for hiding this comment

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

Suggested change
DorisMetrics::instance()->base_compaction_request_failed->increment(1);
DorisMetrics::instance()->base_compaction_request_failed->increment(1);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

yangzhg
yangzhg previously approved these changes Sep 15, 2021
Copy link
Member

@yangzhg yangzhg left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Sep 15, 2021
@github-actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

1
2

3

4

add tablet order

fix slot bug

1. show proc location default
2. no proper tag
3. random distribution
4. send token shutdown

remove log

fix codestyle
@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label Sep 16, 2021
@yangzhg
Copy link
Member

yangzhg commented Sep 17, 2021

LGTM

Copy link
Member

@yangzhg yangzhg left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Sep 17, 2021
@github-actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@caiconghui caiconghui merged commit fee8e6a into apache:master Sep 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. kind/fix Categorizes issue or PR as related to a bug. reviewed

Projects

None yet

3 participants