Repository: hadoop Updated Branches: refs/heads/HDFS-7240 7de498c3a -> 3c9a9a117
HDFS-13127. Fix TestContainerStateManager and TestOzoneConfigurationFields. Contributed by Mukul Kumar Singh. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3c9a9a11 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3c9a9a11 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3c9a9a11 Branch: refs/heads/HDFS-7240 Commit: 3c9a9a117d6a12220752a52d68cc7e41ca816631 Parents: 7de498c Author: Anu Engineer <aengin...@apache.org> Authored: Fri Feb 9 15:23:13 2018 -0800 Committer: Anu Engineer <aengin...@apache.org> Committed: Fri Feb 9 15:23:13 2018 -0800 ---------------------------------------------------------------------- .../hadoop/ozone/client/rest/RestClient.java | 4 +--- .../scm/container/ContainerStateManager.java | 3 +-- .../src/main/resources/ozone-default.xml | 19 ------------------- .../scm/container/TestContainerStateManager.java | 4 +++- 4 files changed, 5 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c9a9a11/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java index 56fadd2..c420ce5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java @@ -89,9 +89,7 @@ import static java.net.HttpURLConnection.HTTP_OK; /** * Ozone Client REST protocol implementation. It uses REST protocol to - * connect to Ozone Handler that executes client calls. RestClient uses - * <code>ozone.rest.servers</code> and <code>ozone.rest.client.port</code> - * to discover Ozone Rest Server. + * connect to Ozone Handler that executes client calls. */ public class RestClient implements ClientProtocol { http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c9a9a11/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerStateManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerStateManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerStateManager.java index 6fb5872..c586107 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerStateManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerStateManager.java @@ -415,8 +415,7 @@ public class ContainerStateManager implements Closeable { // Get the container with space to meet our request. for (ContainerID id : searchSet) { ContainerInfo containerInfo = containers.getContainerInfo(id.getId()); - if ((containerInfo.getAllocatedBytes() <= this.containerSize) && - (containerInfo.getAllocatedBytes() <= size)) { + if (containerInfo.getAllocatedBytes() + size <= this.containerSize) { containerInfo.updateLastUsedTime(); ContainerState key = new ContainerState(owner, http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c9a9a11/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml index e09afb2..db21c12 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml @@ -1205,25 +1205,6 @@ </description> </property> <property> - <name>ozone.rest.servers</name> - <value></value> - <tag>OZONE, CLIENT</tag> - <description> - The REST server hostnames to connect, comma separated list of host - (typically datanodes) where Ozone REST handler are running. - </description> - </property> - <property> - <name>ozone.rest.client.port</name> - <value>9864</value> - <tag>OZONE, CLIENT</tag> - <description> - Port used by client to connect to Ozone REST server. When a datanode - is configured to run Ozone REST handler, this port typically points to - datanode info port. - </description> - </property> - <property> <name>ozone.rest.client.http.connection.max</name> <value>100</value> <tag>OZONE, CLIENT</tag> http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c9a9a11/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerStateManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerStateManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerStateManager.java index 633e876..9b1a4c1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerStateManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/container/TestContainerStateManager.java @@ -159,11 +159,13 @@ public class TestContainerStateManager { scmContainerMapping.updateContainerState(container2, OzoneProtos.LifeCycleEvent.CREATED); + // space has already been allocated in container1, now container 2 should + // be chosen. info = stateManager .getMatchingContainer(OzoneConsts.GB * 3, containerOwner, xceiverClientManager.getType(), xceiverClientManager.getFactor(), OzoneProtos.LifeCycleState.OPEN); - Assert.assertEquals(container1, info.getContainerName()); + Assert.assertEquals(container2, info.getContainerName()); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
