You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/04/08 23:56:05 UTC

[hadoop] 02/02: fix review comments

This is an automated email from the ASF dual-hosted git repository.

bharat pushed a commit to branch HDDS-1393
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 8f65739bdb3ea24ec6217e3d3b51e07155e4b1de
Author: Bharat Viswanadham <bh...@apache.org>
AuthorDate: Mon Apr 8 16:53:44 2019 -0700

    fix review comments
---
 hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto        | 5 ++++-
 .../hadoop/ozone/protocolPB/OzoneManagerHARequestHandlerImpl.java    | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto b/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto
index e641464..2192767 100644
--- a/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto
+++ b/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto
@@ -478,7 +478,10 @@ message InfoBucketResponse {
 }
 
 message SetBucketPropertyRequest {
-    required BucketArgs bucketArgs = 1;
+    //TODO: See if we can merge BucketArgs and BucketInfo.
+    optional BucketArgs bucketArgs = 1;
+    // Set during startTransaction and used in applyTransaction to apply to
+    // OM DB.
     optional BucketInfo bucketInfo = 2;
 }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerHARequestHandlerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerHARequestHandlerImpl.java
index 0830251..9dd27b8 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerHARequestHandlerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerHARequestHandlerImpl.java
@@ -346,7 +346,6 @@ public class OzoneManagerHARequestHandlerImpl
 
     SetBucketPropertyRequest newSetBucketPropertyRequest =
         SetBucketPropertyRequest.newBuilder()
-            .setBucketArgs(setBucketPropertyRequest.getBucketArgs())
             .setBucketInfo(omBucketInfo.getProtobuf()).build();
 
     return omRequest.toBuilder().setSetBucketPropertyRequest(


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org