[hadoop] branch ozone-0.4 updated: HDDS-1302. Fix SCM CLI does not list container with id 1.

[bharat]

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

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


The following commit(s) were added to refs/heads/ozone-0.4 by this push:
     new 6b3e0b3  HDDS-1302. Fix SCM CLI does not list container with id 1.
6b3e0b3 is described below

commit 6b3e0b3edce70fb008282a8ae1ea9ee48297f087
Author: Vivek Ratnavel Subramanian <vivekratnave...@gmail.com>
AuthorDate: Fri Mar 22 15:15:01 2019 -0700

    HDDS-1302. Fix SCM CLI does not list container with id 1.
    
    (cherry picked from commit 73f7b04e2b8f9a4b06a1e5b5c62eadd074555205)
---
 .../org/apache/hadoop/hdds/scm/container/SCMContainerManager.java  | 2 +-
 .../org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
 
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
index 2615289..374772d 100644
--- 
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
+++ 
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
@@ -190,7 +190,7 @@ public class SCMContainerManager implements 
ContainerManager {
       Collections.sort(containersIds);
 
       return containersIds.stream()
-          .filter(id -> id.getId() >= startId)
+          .filter(id -> id.getId() > startId)
           .limit(count)
           .map(id -> {
             try {
diff --git 
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
 
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
index 1024fa3..5196603 100644
--- 
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
+++ 
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
@@ -296,8 +296,13 @@ public class SCMClientProtocolServer implements
     auditMap.put("startContainerID", String.valueOf(startContainerID));
     auditMap.put("count", String.valueOf(count));
     try {
+      // To allow startcontainerId to take the value "0",
+      // "null" is assigned, so that its handled in the
+      // scm.getContainerManager().listContainer method
+      final ContainerID containerId = startContainerID != 0 ? ContainerID
+          .valueof(startContainerID) : null;
       return scm.getContainerManager().
-          listContainer(ContainerID.valueof(startContainerID), count);
+          listContainer(containerId, count);
     } catch (Exception ex) {
       auditSuccess = false;
       AUDIT.logReadFailure(


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