You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2023/08/31 13:57:19 UTC
[hbase] branch branch-2.5 updated (8baae886b16 -> 3f0fbf08d11)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 8baae886b16 HBASE-27966 HBase Master/RS JVM metrics populated incorrectly (#5323) (#5364)
new 01b3c356278 HBASE-28051 The javadoc about RegionProcedureStore.delete is incorrect (#5377)
new 3f0fbf08d11 HBASE-28052 Removing the useless parameters from ProcedureExecutor.loadProcedures (#5378)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java | 5 ++---
.../hadoop/hbase/procedure2/store/region/RegionProcedureStore.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
[hbase] 01/02: HBASE-28051 The javadoc about RegionProcedureStore.delete is incorrect (#5377)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 01b3c356278ea0c195c80d77bc8df597591ca46b
Author: guluo <lu...@qq.com>
AuthorDate: Thu Aug 31 21:33:17 2023 +0800
HBASE-28051 The javadoc about RegionProcedureStore.delete is incorrect (#5377)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit fd33c14e1ccb151becf13cd406c159f65594eb19)
---
.../hadoop/hbase/procedure2/store/region/RegionProcedureStore.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure2/store/region/RegionProcedureStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure2/store/region/RegionProcedureStore.java
index 93fbe8c95fe..9cc42bf587f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure2/store/region/RegionProcedureStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure2/store/region/RegionProcedureStore.java
@@ -71,7 +71,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos;
* A procedure store which uses the master local store to store all the procedures.
* <p/>
* We use proc:d column to store the serialized protobuf format procedure, and when deleting we will
- * first fill the info:proc column with an empty byte array, and then actually delete them in the
+ * first fill the proc:d column with an empty byte array, and then actually delete them in the
* {@link #cleanup()} method. This is because that we need to retain the max procedure id, so we can
* not directly delete a procedure row as we do not know if it is the one with the max procedure id.
*/
[hbase] 02/02: HBASE-28052 Removing the useless parameters from ProcedureExecutor.loadProcedures (#5378)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 3f0fbf08d116a3f6209d95780203b9e21d3a0e2b
Author: guluo <lu...@qq.com>
AuthorDate: Thu Aug 31 21:33:45 2023 +0800
HBASE-28052 Removing the useless parameters from ProcedureExecutor.loadProcedures (#5378)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit 121c8e17ecea66267fe77bab078f79d14a74a832)
---
.../java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
index f6263a5530b..696dbb71b9f 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
@@ -332,7 +332,7 @@ public class ProcedureExecutor<TEnvironment> {
@Override
public void load(ProcedureIterator procIter) throws IOException {
- loadProcedures(procIter, abortOnCorruption);
+ loadProcedures(procIter);
}
@Override
@@ -394,8 +394,7 @@ public class ProcedureExecutor<TEnvironment> {
});
}
- private void loadProcedures(ProcedureIterator procIter, boolean abortOnCorruption)
- throws IOException {
+ private void loadProcedures(ProcedureIterator procIter) throws IOException {
// 1. Build the rollback stack
int runnableCount = 0;
int failedCount = 0;