Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,10 @@ jobs:
integration:
needs:
- build-info
- build
- basic
- dependency
- license
if: needs.build-info.outputs.needs-integration-tests == 'true'
uses: ./.github/workflows/check.yml
secrets: inherit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
import org.apache.hadoop.classification.VisibleForTesting;
import org.apache.hadoop.conf.ConfigRedactor;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
Expand All @@ -42,7 +41,6 @@
*/
public abstract class ReconfigurableBase extends Configured implements Reconfigurable {
private static final Logger LOG = LoggerFactory.getLogger(ReconfigurableBase.class);
private final ReconfigurationUtil reconfigurationUtil = new ReconfigurationUtil();
private Thread reconfigThread = null;
private volatile boolean shouldRun = true;
private final Object reconfigLock = new Object();
Expand All @@ -57,12 +55,6 @@ public ReconfigurableBase(Configuration conf) {

protected abstract Configuration getNewConf();

@VisibleForTesting
public Collection<ReconfigurationUtil.PropertyChange> getChangedProperties(Configuration newConf,
Configuration oldConf) {
return this.reconfigurationUtil.parseChangedProperties(newConf, oldConf);
}

public void startReconfigurationTask() throws IOException {
synchronized (this.reconfigLock) {
String errorMessage;
Expand Down Expand Up @@ -150,7 +142,8 @@ public void run() {
LOG.info("Starting reconfiguration task.");
Configuration oldConf = this.parent.getConf();
Configuration newConf = this.parent.getNewConf();
Collection<ReconfigurationUtil.PropertyChange> changes = this.parent.getChangedProperties(newConf, oldConf);
Collection<ReconfigurationUtil.PropertyChange> changes =
ReconfigurationUtil.getChangedProperties(newConf, oldConf);
Map<ReconfigurationUtil.PropertyChange, Optional<String>> results = Maps.newHashMap();
ConfigRedactor oldRedactor = new ConfigRedactor(oldConf);
ConfigRedactor newRedactor = new ConfigRedactor(newConf);
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/ozonefs-hadoop2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<packaging>jar</packaging>
<name>Apache Ozone FS Hadoop 2.x compatibility</name>
<properties>
<mdep.analyze.skip>true</mdep.analyze.skip>
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
</properties>
<dependencies>
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/ozonefs-hadoop3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<properties>
<!-- no tests in this module so far -->
<maven.test.skip>true</maven.test.skip>
<mdep.analyze.skip>true</mdep.analyze.skip>
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
</properties>
<dependencies>
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/ozonefs-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<properties>
<!-- no tests in this module so far -->
<maven.test.skip>true</maven.test.skip>
<mdep.analyze.skip>true</mdep.analyze.skip>
<ozone.shaded.native.prefix>org_apache_ozone_shaded</ozone.shaded.native.prefix>
<!-- refer to ratis thirdparty ratis.thirdparty.shaded.native.prefix -->
<ratis.thirdparty.shaded.native.prefix>org_apache_ratis_thirdparty_</ratis.thirdparty.shaded.native.prefix>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2178,6 +2178,7 @@
<goal>analyze-only</goal>
</goals>
<configuration>
<failOnWarning>true</failOnWarning>
<ignoreNonCompile>true</ignoreNonCompile>
<excludedClasses>
<!-- disabled test -->
Expand Down
Loading