This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 04f13acdbd HDDS-8874. Use OM Service ID instead of OM Node ID for
container ownership (#4922)
04f13acdbd is described below
commit 04f13acdbdbc54f6182a383861826b057912301a
Author: Ivan Andika <[email protected]>
AuthorDate: Thu Oct 26 15:36:04 2023 +0800
HDDS-8874. Use OM Service ID instead of OM Node ID for container ownership
(#4922)
---
.../org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java | 2 +-
.../apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java | 4 ++--
.../org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java | 2 +-
.../java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java | 4 ++--
.../java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java | 2 ++
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
index 73d20b622a..fee9a93e19 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
@@ -139,7 +139,7 @@ public class OMFileCreateRequest extends OMKeyRequest {
new ExcludeList(), requestedSize, scmBlockSize,
ozoneManager.getPreallocateBlocksMax(),
ozoneManager.isGrpcBlockTokenEnabled(),
- ozoneManager.getOMNodeId(),
+ ozoneManager.getOMServiceId(),
ozoneManager.getMetrics());
KeyArgs.Builder newKeyArgs = keyArgs.toBuilder()
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java
index 753ca9c2d2..43301a6ba1 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java
@@ -117,8 +117,8 @@ public class OMAllocateBlockRequest extends OMKeyRequest {
ozoneManager.getBlockTokenSecretManager(), repConfig, excludeList,
ozoneManager.getScmBlockSize(), ozoneManager.getScmBlockSize(),
ozoneManager.getPreallocateBlocksMax(),
- ozoneManager.isGrpcBlockTokenEnabled(), ozoneManager.getOMNodeId(),
- ozoneManager.getMetrics());
+ ozoneManager.isGrpcBlockTokenEnabled(),
+ ozoneManager.getOMServiceId(), ozoneManager.getMetrics());
// Set modification time and normalize key if required.
KeyArgs.Builder newKeyArgs =
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
index 91d830ffaa..2a03e12c86 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
@@ -148,7 +148,7 @@ public class OMKeyCreateRequest extends OMKeyRequest {
new ExcludeList(), requestedSize, scmBlockSize,
ozoneManager.getPreallocateBlocksMax(),
ozoneManager.isGrpcBlockTokenEnabled(),
- ozoneManager.getOMNodeId(),
+ ozoneManager.getOMServiceId(),
ozoneManager.getMetrics());
newKeyArgs = keyArgs.toBuilder().setModificationTime(Time.now())
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
index 749b0f3fe6..ea97aa68c1 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -142,7 +142,7 @@ public abstract class OMKeyRequest extends OMClientRequest {
OzoneBlockTokenSecretManager secretManager,
ReplicationConfig replicationConfig, ExcludeList excludeList,
long requestedSize, long scmBlockSize, int preallocateBlocksMax,
- boolean grpcBlockTokenEnabled, String omID, OMMetrics omMetrics)
+ boolean grpcBlockTokenEnabled, String serviceID, OMMetrics omMetrics)
throws IOException {
int dataGroupSize = replicationConfig instanceof ECReplicationConfig
? ((ECReplicationConfig) replicationConfig).getData() : 1;
@@ -154,7 +154,7 @@ public abstract class OMKeyRequest extends OMClientRequest {
List<AllocatedBlock> allocatedBlocks;
try {
allocatedBlocks = scmClient.getBlockClient()
- .allocateBlock(scmBlockSize, numBlocks, replicationConfig, omID,
+ .allocateBlock(scmBlockSize, numBlocks, replicationConfig, serviceID,
excludeList);
} catch (SCMException ex) {
omMetrics.incNumBlockAllocateCallFails();
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java
index 0954382b78..bc8563f6f6 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java
@@ -170,6 +170,8 @@ public class TestOMKeyRequest {
when(ozoneManager.getPreallocateBlocksMax()).thenReturn(2);
when(ozoneManager.isGrpcBlockTokenEnabled()).thenReturn(false);
when(ozoneManager.getOMNodeId()).thenReturn(UUID.randomUUID().toString());
+ when(ozoneManager.getOMServiceId()).thenReturn(
+ UUID.randomUUID().toString());
when(scmClient.getBlockClient()).thenReturn(scmBlockLocationProtocol);
when(ozoneManager.getKeyManager()).thenReturn(keyManager);
when(ozoneManager.getAccessAuthorizer())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
