[ozone] branch HDDS-3698-nonrolling-upgrade updated: HDDS-5415. Fix TestSCMNodeManager after merge of master at 1d8f972 into upgrade branch (#2388)

[av...@apache.org]

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

avijayan pushed a commit to branch HDDS-3698-nonrolling-upgrade
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/HDDS-3698-nonrolling-upgrade by this push:
     new aaeae47  HDDS-5415. Fix TestSCMNodeManager after merge of master at 1d8f972 into upgrade branch (#2388)
aaeae47 is described below

commit aaeae47f4d5939bda587b66040ef825efb0bb6b7
Author: Ethan Rose <33...@users.noreply.github.com>
AuthorDate: Tue Jul 6 14:31:12 2021 -0700

    HDDS-5415. Fix TestSCMNodeManager after merge of master at 1d8f972 into upgrade branch (#2388)
---
 .../src/test/java/org/apache/hadoop/hdds/scm/TestUtils.java    | 10 ++++++++++
 .../org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java    |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestUtils.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestUtils.java
index db145c7..17323f5 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestUtils.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestUtils.java
@@ -293,11 +293,21 @@ public final class TestUtils {
   }
 
   public static MetadataStorageReportProto createMetadataStorageReport(
+      String path, long capacity) {
+    return createMetadataStorageReport(path,
+        capacity,
+        0,
+        capacity,
+        StorageTypeProto.DISK, false);
+  }
+
+  public static MetadataStorageReportProto createMetadataStorageReport(
       String path, long capacity, long used, long remaining,
       StorageTypeProto type) {
     return createMetadataStorageReport(path, capacity, used, remaining,
         type, false);
   }
+
   /**
    * Creates metadata storage report with the given information.
    *
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
index 4554b53..7c4de69 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
@@ -49,6 +49,7 @@ import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
 import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.NodeReportFromDatanode;
 import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.NodeReportProto;
 import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto;
+import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
 import org.apache.hadoop.hdds.scm.TestUtils;
 import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
@@ -285,13 +286,18 @@ public class TestSCMNodeManager {
   private DatanodeDetails registerWithCapacity(SCMNodeManager nodeManager,
       LayoutVersionProto layout, ErrorCode expectedResult) {
     DatanodeDetails details = MockDatanodeDetails.randomDatanodeDetails();
+
     StorageReportProto storageReport =
         TestUtils.createStorageReport(details.getUuid(),
             details.getNetworkFullPath(), Long.MAX_VALUE);
+    MetadataStorageReportProto metadataStorageReport =
+        TestUtils.createMetadataStorageReport(details.getNetworkFullPath(),
+            Long.MAX_VALUE);
+
     RegisteredCommand cmd = nodeManager.register(
         MockDatanodeDetails.randomDatanodeDetails(),
         TestUtils.createNodeReport(Arrays.asList(storageReport),
-            Collections.emptyList()),
+            Arrays.asList(metadataStorageReport)),
         getRandomPipelineReports(), layout);
 
     Assert.assertEquals(expectedResult, cmd.getError());

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