This is an automated email from the ASF dual-hosted git repository.
ljain 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 e9cce6e HDDS-5670. ContainerBalancer should get OzoneConfiguration
from ContainerBalancerConfiguration. (#2577)
e9cce6e is described below
commit e9cce6ea59544b66633753fd02a1399ebb3cb34a
Author: Siddhant Sangwan <[email protected]>
AuthorDate: Thu Sep 9 11:59:56 2021 +0530
HDDS-5670. ContainerBalancer should get OzoneConfiguration from
ContainerBalancerConfiguration. (#2577)
---
.../hdds/scm/container/balancer/ContainerBalancer.java | 2 +-
.../container/balancer/ContainerBalancerConfiguration.java | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
index 7d1c500..a55eccf 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
@@ -147,8 +147,8 @@ public class ContainerBalancer {
}
balancerRunning = true;
- ozoneConfiguration = new OzoneConfiguration();
this.config = balancerConfiguration;
+ this.ozoneConfiguration = config.getOzoneConfiguration();
LOG.info("Starting Container Balancer...{}", this);
//we should start a new balancer thread async
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
index ed4025a..a17f31b 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hdds.scm.container.balancer;
+import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.conf.Config;
import org.apache.hadoop.hdds.conf.ConfigGroup;
import org.apache.hadoop.hdds.conf.ConfigTag;
@@ -111,10 +112,12 @@ public final class ContainerBalancerConfiguration {
*/
public ContainerBalancerConfiguration(
OzoneConfiguration ozoneConfiguration) {
+ Preconditions.checkNotNull(ozoneConfiguration,
+ "OzoneConfiguration should not be null.");
this.ozoneConfiguration = ozoneConfiguration;
// balancing interval should be greater than DUFactory refresh period
- duConf = ozoneConfiguration.getObject(DUFactory.Conf.class);
+ duConf = this.ozoneConfiguration.getObject(DUFactory.Conf.class);
balancingInterval = duConf.getRefreshPeriod().toMillis() +
Duration.ofMinutes(10).toMillis();
}
@@ -275,6 +278,15 @@ public final class ContainerBalancerConfiguration {
}
}
+ /**
+ * Gets the {@link OzoneConfiguration} using which this configuration was
+ * constructed.
+ * @return the {@link OzoneConfiguration} being used by this configuration
+ */
+ public OzoneConfiguration getOzoneConfiguration() {
+ return this.ozoneConfiguration;
+ }
+
@Override
public String toString() {
return String.format("Container Balancer Configuration values:%n" +
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
