diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java index 766d2594502f..06c5b5bc83a8 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport; import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; /** * The interface to call into underlying container layer. diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java index d546bf3f07a6..73ef288ad4c5 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport; import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.token.Token; diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalization.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalization.java new file mode 100644 index 000000000000..131469e43411 --- /dev/null +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalization.java @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.upgrade; + +import java.util.Collection; +import java.util.Collections; +import org.apache.hadoop.hdds.annotation.InterfaceAudience; +import org.apache.hadoop.hdds.annotation.InterfaceStability; + +/** Client-side interface of upgrade finalization. */ +@InterfaceAudience.Private +@InterfaceStability.Evolving +public final class UpgradeFinalization { + + /** + * Default message can be used to indicate the starting of finalization. + */ + public static final StatusAndMessages STARTING_MSG = new StatusAndMessages( + Status.STARTING_FINALIZATION, + Collections.singletonList("Starting Finalization") + ); + + public static final StatusAndMessages FINALIZATION_IN_PROGRESS_MSG = new StatusAndMessages( + Status.FINALIZATION_IN_PROGRESS, + Collections.singletonList("Finalization in progress") + ); + + public static final StatusAndMessages FINALIZATION_REQUIRED_MSG = new StatusAndMessages( + Status.FINALIZATION_REQUIRED, + Collections.singletonList("Finalization required") + ); + + /** + * Default message to provide when the service is in ALREADY_FINALIZED state. + */ + public static final StatusAndMessages FINALIZED_MSG = new StatusAndMessages( + Status.ALREADY_FINALIZED, Collections.emptyList() + ); + + /** + * Represents the current state in which the service is with regards to + * finalization after an upgrade. + * The state transitions are the following: + * {@code ALREADY_FINALIZED} - no entry no exit from this status without restart. + * After an upgrade: + * {@code FINALIZATION_REQUIRED -(finalize)-> STARTING_FINALIZATION + * -> FINALIZATION_IN_PROGRESS -> FINALIZATION_DONE} from finalization done + * there is no more move possible, after a restart the service can end up in: + * {@code FINALIZATION_REQUIRED}, if the finalization failed and have not reached + * {@code FINALIZATION_DONE}, + * - or it can be {@code ALREADY_FINALIZED} if the finalization was successfully done. + */ + public enum Status { + ALREADY_FINALIZED, + STARTING_FINALIZATION, + FINALIZATION_IN_PROGRESS, + FINALIZATION_DONE, + FINALIZATION_REQUIRED, + } + + /** + * A class that holds the current service status, and if the finalization is + * ongoing, the messages that should be passed to the initiating client of + * finalization. + * This translates to a counterpart in the RPC layer. + */ + public static final class StatusAndMessages { + private final Status status; + private final Collection msgs; + + /** + * Constructs a StatusAndMessages tuple from the given params. + * @param status the finalization status of the service + * @param msgs the messages to be transferred to the client + */ + public StatusAndMessages(Status status, Collection msgs) { + this.status = status; + this.msgs = msgs; + } + + /** + * Provides the status. + * @return the upgrade finalization status. + */ + public Status status() { + return status; + } + + /** + * Provides the messages, or an empty list if there are no messages. + * @return a list with possibly multiple messages. + */ + public Collection msgs() { + return msgs; + } + } + + private UpgradeFinalization() { + // no instances + } + +} diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java index e6088d747e81..e4d2050e4274 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java @@ -78,8 +78,8 @@ import org.apache.hadoop.ozone.container.upgrade.DataNodeUpgradeFinalizer; import org.apache.hadoop.ozone.container.upgrade.VersionedDatanodeFeatures; import org.apache.hadoop.ozone.protocol.commands.SCMCommand; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; import org.apache.hadoop.util.Time; import org.apache.ratis.util.ExitUtils; import org.slf4j.Logger; diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/FinalizeNewLayoutVersionCommandHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/FinalizeNewLayoutVersionCommandHandler.java index 9cb4f21b3ac6..6e1c566343da 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/FinalizeNewLayoutVersionCommandHandler.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/FinalizeNewLayoutVersionCommandHandler.java @@ -17,7 +17,7 @@ package org.apache.hadoop.ozone.container.common.statemachine.commandhandler; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_REQUIRED; import java.util.concurrent.atomic.AtomicLong; import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.FinalizeNewLayoutVersionCommandProto; diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java index cd1787347697..1c741ac76f65 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java @@ -18,8 +18,8 @@ package org.apache.hadoop.ozone.container.upgrade; import static org.apache.hadoop.ozone.upgrade.UpgradeException.ResultCodes.PREFINALIZE_VALIDATION_FAILED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_IN_PROGRESS; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_IN_PROGRESS; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_REQUIRED; import java.io.IOException; import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java index df1e483566f3..e03f78fcf857 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java @@ -137,8 +137,8 @@ import org.apache.hadoop.ipc.ProtocolTranslator; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.ozone.ClientVersion; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.ozone.util.ProtobufUtils; import org.apache.hadoop.security.token.Token; @@ -1135,7 +1135,7 @@ public StatusAndMessages finalizeScmUpgrade(String upgradeClientID) UpgradeFinalizationStatus status = response.getStatus(); return new StatusAndMessages( - UpgradeFinalizer.Status.valueOf(status.getStatus().name()), + UpgradeFinalization.Status.valueOf(status.getStatus().name()), status.getMessagesList()); } @@ -1158,7 +1158,7 @@ public StatusAndMessages queryUpgradeFinalizationProgress( UpgradeFinalizationStatus status = response.getStatus(); return new StatusAndMessages( - UpgradeFinalizer.Status.valueOf(status.getStatus().name()), + UpgradeFinalization.Status.valueOf(status.getStatus().name()), status.getMessagesList()); } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Storage.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/common/Storage.java similarity index 100% rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Storage.java rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/common/Storage.java diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java similarity index 100% rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java index 223d541a29ca..5aa553b30d5f 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/AbstractLayoutVersionManager.java @@ -17,8 +17,8 @@ package org.apache.hadoop.ozone.upgrade; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.ALREADY_FINALIZED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.ALREADY_FINALIZED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_REQUIRED; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -31,7 +31,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.management.ObjectName; import org.apache.hadoop.metrics2.util.MBeans; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java index dcb1eaa4cc2c..306ea3bd362c 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java @@ -24,10 +24,14 @@ import static org.apache.hadoop.ozone.upgrade.UpgradeException.ResultCodes.LAYOUT_FEATURE_FINALIZATION_FAILED; import static org.apache.hadoop.ozone.upgrade.UpgradeException.ResultCodes.PREFINALIZE_ACTION_VALIDATION_FAILED; import static org.apache.hadoop.ozone.upgrade.UpgradeException.ResultCodes.UPDATE_LAYOUT_VERSION_FAILED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_DONE; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_IN_PROGRESS; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.STARTING_FINALIZATION; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.FINALIZATION_IN_PROGRESS_MSG; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.FINALIZATION_REQUIRED_MSG; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.FINALIZED_MSG; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.STARTING_MSG; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_DONE; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_IN_PROGRESS; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_REQUIRED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.STARTING_FINALIZATION; import com.google.common.annotations.VisibleForTesting; import java.io.IOException; @@ -44,6 +48,8 @@ import org.apache.hadoop.ozone.upgrade.LayoutFeature.UpgradeAction; import org.apache.hadoop.ozone.upgrade.LayoutFeature.UpgradeActionType; import org.apache.hadoop.ozone.upgrade.UpgradeException.ResultCodes; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.ratis.protocol.exceptions.NotLeaderException; /** diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java index 33c4111c70c8..dad1ebd0d7e1 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java @@ -17,7 +17,7 @@ package org.apache.hadoop.ozone.upgrade; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_REQUIRED; import java.io.IOException; import org.slf4j.Logger; diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java similarity index 63% rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java index de61b792ab4d..f144821c9ec3 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java @@ -18,12 +18,11 @@ package org.apache.hadoop.ozone.upgrade; import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.hdds.annotation.InterfaceStability; import org.apache.hadoop.ozone.common.Storage; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,89 +43,6 @@ public interface UpgradeFinalizer { Logger LOG = LoggerFactory.getLogger(UpgradeFinalizer.class); - /** - * Represents the current state in which the service is with regards to - * finalization after an upgrade. - * The state transitions are the following: - * {@code ALREADY_FINALIZED} - no entry no exit from this status without restart. - * After an upgrade: - * {@code FINALIZATION_REQUIRED -(finalize)-> STARTING_FINALIZATION - * -> FINALIZATION_IN_PROGRESS -> FINALIZATION_DONE} from finalization done - * there is no more move possible, after a restart the service can end up in: - * {@code FINALIZATION_REQUIRED}, if the finalization failed and have not reached - * {@code FINALIZATION_DONE}, - * - or it can be {@code ALREADY_FINALIZED} if the finalization was successfully done. - */ - enum Status { - ALREADY_FINALIZED, - STARTING_FINALIZATION, - FINALIZATION_IN_PROGRESS, - FINALIZATION_DONE, - FINALIZATION_REQUIRED, - } - - /** - * A class that holds the current service status, and if the finalization is - * ongoing, the messages that should be passed to the initiating client of - * finalization. - * This translates to a counterpart in the RPC layer. - */ - class StatusAndMessages { - private Status status; - private Collection msgs; - - /** - * Constructs a StatusAndMessages tuple from the given params. - * @param status the finalization status of the service - * @param msgs the messages to be transferred to the client - */ - public StatusAndMessages(Status status, Collection msgs) { - this.status = status; - this.msgs = msgs; - } - - /** - * Provides the status. - * @return the upgrade finalization status. - */ - public Status status() { - return status; - } - - /** - * Provides the messages, or an empty list if there are no messages. - * @return a list with possibly multiple messages. - */ - public Collection msgs() { - return msgs; - } - } - - /** - * Default message can be used to indicate the starting of finalization. - */ - StatusAndMessages STARTING_MSG = new StatusAndMessages( - Status.STARTING_FINALIZATION, - Arrays.asList("Starting Finalization") - ); - - StatusAndMessages FINALIZATION_IN_PROGRESS_MSG = new StatusAndMessages( - Status.FINALIZATION_IN_PROGRESS, - Arrays.asList("Finalization in progress") - ); - - StatusAndMessages FINALIZATION_REQUIRED_MSG = new StatusAndMessages( - Status.FINALIZATION_REQUIRED, - Arrays.asList("Finalization required") - ); - - /** - * Default message to provide when the service is in ALREADY_FINALIZED state. - */ - StatusAndMessages FINALIZED_MSG = new StatusAndMessages( - Status.ALREADY_FINALIZED, Collections.emptyList() - ); - /** * Finalize the metadata upgrade. * The provided client ID will be eligible to get the status messages, diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/InjectedUpgradeFinalizationExecutor.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/InjectedUpgradeFinalizationExecutor.java index a7955d1f3c87..510d1f3aa07b 100644 --- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/InjectedUpgradeFinalizationExecutor.java +++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/InjectedUpgradeFinalizationExecutor.java @@ -21,7 +21,7 @@ import static org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor.UpgradeTestInjectionPoints.AFTER_POST_FINALIZE_UPGRADE; import static org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor.UpgradeTestInjectionPoints.AFTER_PRE_FINALIZE_UPGRADE; import static org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor.UpgradeTestInjectionPoints.BEFORE_PRE_FINALIZE_UPGRADE; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_REQUIRED; import java.io.IOException; import java.util.concurrent.Callable; diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestBasicUpgradeFinalizer.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestBasicUpgradeFinalizer.java index 2fd260935139..a37665dcdb80 100644 --- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestBasicUpgradeFinalizer.java +++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestBasicUpgradeFinalizer.java @@ -19,8 +19,8 @@ import static org.apache.hadoop.ozone.upgrade.TestUpgradeFinalizerActions.MockLayoutFeature.VERSION_1; import static org.apache.hadoop.ozone.upgrade.TestUpgradeFinalizerActions.MockLayoutFeature.VERSION_3; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.ALREADY_FINALIZED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_DONE; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.ALREADY_FINALIZED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_DONE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,7 +41,7 @@ import org.apache.hadoop.ozone.common.Storage; import org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor.UpgradeTestInjectionPoints; import org.apache.hadoop.ozone.upgrade.TestUpgradeFinalizerActions.MockLayoutVersionManager; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.slf4j.Logger; @@ -123,14 +123,14 @@ public void testConcurrentFinalization() throws Exception { // The first finalize call should block until the executor is unpaused. Future firstFinalizeFuture = runFinalization(finalizer, - UpgradeFinalizer.Status.STARTING_FINALIZATION); + UpgradeFinalization.Status.STARTING_FINALIZATION); // Wait for finalization to pause at the halting point. pauseLatch.await(); Future secondFinalizeFuture = runFinalization(finalizer, - UpgradeFinalizer.Status.FINALIZATION_IN_PROGRESS); + UpgradeFinalization.Status.FINALIZATION_IN_PROGRESS); Future finalizeQueryFuture = runFinalizationQuery(finalizer, - UpgradeFinalizer.Status.FINALIZATION_IN_PROGRESS); + UpgradeFinalization.Status.FINALIZATION_IN_PROGRESS); // While finalization is paused, the two following requests should have // reported it is in progress. @@ -146,7 +146,7 @@ public void testConcurrentFinalization() throws Exception { List> finalizeFutures = new ArrayList<>(); for (int i = 0; i < 10; i++) { finalizeFutures.add(runFinalizationQuery(finalizer, - UpgradeFinalizer.Status.FINALIZATION_DONE)); + UpgradeFinalization.Status.FINALIZATION_DONE)); } // Wait for all queries to complete. @@ -157,7 +157,7 @@ public void testConcurrentFinalization() throws Exception { private Future runFinalization( BasicUpgradeFinalizer finalizer, - UpgradeFinalizer.Status expectedStatus) { + UpgradeFinalization.Status expectedStatus) { return Executors.newSingleThreadExecutor().submit(() -> { try { StatusAndMessages result = finalizer.finalize("test", new Object()); @@ -171,7 +171,7 @@ private Future runFinalization( } private Future runFinalizationQuery(UpgradeFinalizer finalizer, - UpgradeFinalizer.Status expectedStatus) { + UpgradeFinalization.Status expectedStatus) { return Executors.newSingleThreadExecutor().submit(() -> { assertEquals(expectedStatus, finalizer.getStatus()); }); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java index 8ead0501dd0a..c24d085acf60 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java @@ -147,7 +147,7 @@ import org.apache.hadoop.hdds.upgrade.HDDSLayoutFeature; import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics; import org.apache.hadoop.ozone.ClientVersion; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.ozone.util.ProtobufUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 c7ca09a31370..24962dc11b9d 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 @@ -113,7 +113,7 @@ import org.apache.hadoop.ozone.audit.AuditMessage; import org.apache.hadoop.ozone.audit.Auditor; import org.apache.hadoop.ozone.audit.SCMAction; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.ratis.grpc.GrpcTlsConfig; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationCheckpoint.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationCheckpoint.java index f598f7a2ee6d..d1d422c2e0e5 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationCheckpoint.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationCheckpoint.java @@ -17,7 +17,7 @@ package org.apache.hadoop.hdds.scm.server.upgrade; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; /** * A finalization checkpoint is an abstraction over SCM's disk state, @@ -30,23 +30,23 @@ */ public enum FinalizationCheckpoint { FINALIZATION_REQUIRED(false, true, - UpgradeFinalizer.Status.FINALIZATION_REQUIRED), + UpgradeFinalization.Status.FINALIZATION_REQUIRED), FINALIZATION_STARTED(true, true, - UpgradeFinalizer.Status.FINALIZATION_IN_PROGRESS), + UpgradeFinalization.Status.FINALIZATION_IN_PROGRESS), MLV_EQUALS_SLV(true, false, - UpgradeFinalizer.Status.FINALIZATION_IN_PROGRESS), + UpgradeFinalization.Status.FINALIZATION_IN_PROGRESS), FINALIZATION_COMPLETE(false, false, - UpgradeFinalizer.Status.FINALIZATION_DONE); + UpgradeFinalization.Status.FINALIZATION_DONE); private final boolean needsFinalizingMark; private final boolean needsMlvBehindSlv; // The upgrade status that should be reported back to the client when this // checkpoint is crossed. - private final UpgradeFinalizer.Status status; + private final UpgradeFinalization.Status status; FinalizationCheckpoint(boolean needsFinalizingMark, boolean needsMlvBehindSlv, - UpgradeFinalizer.Status status) { + UpgradeFinalization.Status status) { this.needsFinalizingMark = needsFinalizingMark; this.needsMlvBehindSlv = needsMlvBehindSlv; this.status = status; @@ -81,7 +81,7 @@ public boolean hasCrossed(FinalizationCheckpoint query) { return this.compareTo(query) >= 0; } - public UpgradeFinalizer.Status getStatus() { + public UpgradeFinalization.Status getStatus() { return status; } } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationManager.java index 288cf90d7130..b06f6c290e26 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationManager.java @@ -25,17 +25,17 @@ import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.upgrade.BasicUpgradeFinalizer; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; /** * Class to initiate SCM finalization and query its progress. */ public interface FinalizationManager { - UpgradeFinalizer.StatusAndMessages finalizeUpgrade(String upgradeClientID) + UpgradeFinalization.StatusAndMessages finalizeUpgrade(String upgradeClientID) throws IOException; - UpgradeFinalizer.StatusAndMessages queryUpgradeFinalizationProgress( + UpgradeFinalization.StatusAndMessages queryUpgradeFinalizationProgress( String upgradeClientID, boolean takeover, boolean readonly ) throws IOException; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationManagerImpl.java index 3b88f0de8b0f..99a0cb7dc153 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/FinalizationManagerImpl.java @@ -34,8 +34,8 @@ import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.upgrade.BasicUpgradeFinalizer; import org.apache.hadoop.ozone.upgrade.DefaultUpgradeFinalizationExecutor; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import org.apache.hadoop.ozone.upgrade.UpgradeFinalizationExecutor; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; import org.apache.ratis.util.ExitUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -107,7 +107,7 @@ public void buildUpgradeContext(NodeManager nodeManager, } @Override - public UpgradeFinalizer.StatusAndMessages finalizeUpgrade( + public UpgradeFinalization.StatusAndMessages finalizeUpgrade( String upgradeClientID) throws IOException { Preconditions.checkNotNull(context, "Cannot finalize upgrade without " + @@ -116,11 +116,11 @@ public UpgradeFinalizer.StatusAndMessages finalizeUpgrade( } @Override - public UpgradeFinalizer.StatusAndMessages queryUpgradeFinalizationProgress( + public UpgradeFinalization.StatusAndMessages queryUpgradeFinalizationProgress( String upgradeClientID, boolean takeover, boolean readonly ) throws IOException { if (readonly) { - return new UpgradeFinalizer.StatusAndMessages( + return new UpgradeFinalization.StatusAndMessages( upgradeFinalizer.getStatus(), Collections.emptyList()); } return upgradeFinalizer.reportStatus(upgradeClientID, takeover); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmFinalization.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmFinalization.java index 7c3756154932..67e661bc9d07 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmFinalization.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmFinalization.java @@ -51,8 +51,8 @@ import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -336,9 +336,9 @@ private HDDSLayoutVersionManager getMockVersionManagerFromCheckpoint( private StatusAndMessages getStatusFromCheckpoint( FinalizationCheckpoint initialCheckpoint) { if (initialCheckpoint == FinalizationCheckpoint.FINALIZATION_COMPLETE) { - return UpgradeFinalizer.FINALIZED_MSG; + return UpgradeFinalization.FINALIZED_MSG; } else { - return UpgradeFinalizer.STARTING_MSG; + return UpgradeFinalization.STARTING_MSG; } } diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java index afce9669fbda..e3941c35e793 100644 --- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java +++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java @@ -63,7 +63,7 @@ import org.apache.hadoop.hdds.utils.HddsServerUtil; import org.apache.hadoop.ozone.ClientVersion; import org.apache.hadoop.ozone.OzoneSecurityUtil; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java index 58d03c94f996..37cd50d10d2f 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java @@ -73,7 +73,7 @@ import org.apache.hadoop.ozone.snapshot.CancelSnapshotDiffResponse; import org.apache.hadoop.ozone.snapshot.ListSnapshotResponse; import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.token.TokenInfo; @@ -500,7 +500,7 @@ ListOpenFilesResult listOpenFiles(String path, int maxKeys, String contToken) * @throws OMException * when finalization is already in progress. */ - StatusAndMessages finalizeUpgrade(String upgradeClientID) throws IOException; + UpgradeFinalization.StatusAndMessages finalizeUpgrade(String upgradeClientID) throws IOException; /** * Queries the current status of finalization. @@ -530,7 +530,7 @@ ListOpenFilesResult listOpenFiles(String path, int maxKeys, String contToken) * @throws OMException * if finalization is needed but not yet started */ - StatusAndMessages queryUpgradeFinalizationProgress( + UpgradeFinalization.StatusAndMessages queryUpgradeFinalizationProgress( String upgradeClientID, boolean takeover, boolean readonly ) throws IOException; diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java index b10781b52df3..8c4c80aee52f 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java @@ -243,8 +243,8 @@ import org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone; import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse; import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.ozone.util.ProtobufUtils; import org.apache.hadoop.security.token.Token; @@ -1958,7 +1958,7 @@ public StatusAndMessages finalizeUpgrade(String upgradeClientID) UpgradeFinalizationStatus status = response.getStatus(); return new StatusAndMessages( - UpgradeFinalizer.Status.valueOf(status.getStatus().name()), + UpgradeFinalization.Status.valueOf(status.getStatus().name()), status.getMessagesList() ); } @@ -1985,7 +1985,7 @@ public StatusAndMessages queryUpgradeFinalizationProgress( UpgradeFinalizationStatus status = response.getStatus(); return new StatusAndMessages( - UpgradeFinalizer.Status.valueOf(status.getStatus().name()), + UpgradeFinalization.Status.valueOf(status.getStatus().name()), status.getMessagesList() ); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java index 5a3983d2d056..866393ec0dbf 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java @@ -65,7 +65,7 @@ import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol; import org.apache.hadoop.ozone.om.service.OpenKeyCleanupService; import org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import org.apache.ozone.test.GenericTestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -220,7 +220,7 @@ private void finalizeOMUpgrade() throws Exception { final OzoneManagerProtocol omClient = client.getObjectStore() .getClientProxy().getOzoneManagerClient(); final String upgradeClientID = "Test-Upgrade-Client-" + UUID.randomUUID(); - UpgradeFinalizer.StatusAndMessages finalizationResponse = + UpgradeFinalization.StatusAndMessages finalizationResponse = omClient.finalizeUpgrade(upgradeClientID); // The status should transition as soon as the client call above returns @@ -228,7 +228,7 @@ private void finalizeOMUpgrade() throws Exception { // Wait for the finalization to be marked as done. // 10s timeout should be plenty. await(POLL_MAX_WAIT_MILLIS, POLL_INTERVAL_MILLIS, () -> { - final UpgradeFinalizer.StatusAndMessages progress = + final UpgradeFinalization.StatusAndMessages progress = omClient.queryUpgradeFinalizationProgress( upgradeClientID, false, false); return isDone(progress.status()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java index 11d5bc29fd2a..a2537e6a809c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java @@ -34,10 +34,10 @@ import static org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor.UpgradeTestInjectionPoints.AFTER_POST_FINALIZE_UPGRADE; import static org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor.UpgradeTestInjectionPoints.AFTER_PRE_FINALIZE_UPGRADE; import static org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor.UpgradeTestInjectionPoints.BEFORE_PRE_FINALIZE_UPGRADE; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.ALREADY_FINALIZED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_DONE; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.STARTING_FINALIZATION; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.ALREADY_FINALIZED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_DONE; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_REQUIRED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.STARTING_FINALIZATION; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -84,7 +84,7 @@ import org.apache.hadoop.ozone.upgrade.BasicUpgradeFinalizer; import org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor; import org.apache.hadoop.ozone.upgrade.InjectedUpgradeFinalizationExecutor.UpgradeTestInjectionPoints; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.apache.ozone.test.LambdaTestUtils; import org.apache.ozone.test.tag.Flaky; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHddsUpgradeUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHddsUpgradeUtils.java index 3a05a8a520e9..488884c61e1c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHddsUpgradeUtils.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHddsUpgradeUtils.java @@ -22,8 +22,8 @@ import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.HEALTHY; import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.HEALTHY_READONLY; import static org.apache.hadoop.hdds.scm.pipeline.Pipeline.PipelineState.OPEN; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.ALREADY_FINALIZED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_DONE; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.ALREADY_FINALIZED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_DONE; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -47,7 +47,7 @@ import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.container.common.interfaces.Container; import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import org.apache.ozone.test.GenericTestUtils; import org.apache.ozone.test.LambdaTestUtils; import org.slf4j.Logger; @@ -71,7 +71,7 @@ public static void waitForFinalizationFromClient( StorageContainerLocationProtocol scmClient, String clientID) throws Exception { LambdaTestUtils.await(60_000, 1_000, () -> { - UpgradeFinalizer.Status status = scmClient + UpgradeFinalization.Status status = scmClient .queryUpgradeFinalizationProgress(clientID, true, true) .status(); LOG.info("Waiting for upgrade finalization to complete from client." + diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java index ef12e5c6b910..8f1fc41544a7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java @@ -18,7 +18,7 @@ package org.apache.hadoop.ozone.om; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PrepareStatusResponse.PrepareStatus.PREPARE_COMPLETED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_DONE; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_DONE; import static org.apache.ozone.test.GenericTestUtils.waitFor; import static org.junit.jupiter.api.Assertions.fail; @@ -26,7 +26,7 @@ import java.util.List; import java.util.concurrent.TimeoutException; import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import org.apache.ozone.test.LambdaTestUtils; /** @@ -71,7 +71,7 @@ public static void waitForFinalization(OzoneManagerProtocol omClient) throws TimeoutException, InterruptedException { waitFor(() -> { try { - UpgradeFinalizer.StatusAndMessages statusAndMessages = + UpgradeFinalization.StatusAndMessages statusAndMessages = omClient.queryUpgradeFinalizationProgress("finalize-test", false, false); System.out.println("Finalization Messages : " + diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java index b2f761f02cca..ac0410ba9a1b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java @@ -42,7 +42,7 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import org.apache.ozone.test.LambdaTestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -154,7 +154,7 @@ void allowsLegacyBucketBeforeUpgrade() throws Exception { @Test @Order(DURING_UPGRADE) void finalizeUpgrade() throws Exception { - UpgradeFinalizer.StatusAndMessages response = + UpgradeFinalization.StatusAndMessages response = omClient.finalizeUpgrade("finalize-test"); System.out.println("Finalization Messages : " + response.msgs()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java index 959cc754a08d..4787f2064e5b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java @@ -41,7 +41,7 @@ import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol; import org.apache.hadoop.ozone.om.ratis.OzoneManagerStateMachine; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.ratis.util.LifeCycle; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantVolume.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantVolume.java index 43e97c8d4588..27d39b3d0244 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantVolume.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantVolume.java @@ -48,7 +48,7 @@ import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol; import org.apache.hadoop.ozone.om.protocol.S3Auth; import org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import org.apache.ozone.test.GenericTestUtils; import org.apache.ozone.test.LambdaTestUtils.VoidCallable; import org.junit.jupiter.api.AfterAll; @@ -147,7 +147,7 @@ private static void finalizeOMUpgrade() final OzoneManagerProtocol omClient = client.getObjectStore() .getClientProxy().getOzoneManagerClient(); final String upgradeClientID = "Test-Upgrade-Client-" + UUID.randomUUID(); - UpgradeFinalizer.StatusAndMessages finalizationResponse = + UpgradeFinalization.StatusAndMessages finalizationResponse = omClient.finalizeUpgrade(upgradeClientID); // The status should transition as soon as the client call above returns @@ -157,7 +157,7 @@ private static void finalizeOMUpgrade() // 10s timeout should be plenty. GenericTestUtils.waitFor(() -> { try { - final UpgradeFinalizer.StatusAndMessages progress = + final UpgradeFinalization.StatusAndMessages progress = omClient.queryUpgradeFinalizationProgress( upgradeClientID, false, false); return isDone(progress.status()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java index 5d1634e0639c..f099e88cbeae 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java @@ -131,7 +131,7 @@ import org.apache.hadoop.ozone.snapshot.CancelSnapshotDiffResponse; import org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone; import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.ozone.rocksdiff.CompactionNode; @@ -297,7 +297,7 @@ private void finalizeOMUpgrade() throws Exception { final OzoneManagerProtocol omClient = client.getObjectStore() .getClientProxy().getOzoneManagerClient(); final String upgradeClientID = "Test-Upgrade-Client-" + UUID.randomUUID(); - UpgradeFinalizer.StatusAndMessages finalizationResponse = + UpgradeFinalization.StatusAndMessages finalizationResponse = omClient.finalizeUpgrade(upgradeClientID); // The status should transition as soon as the client call above returns @@ -305,7 +305,7 @@ private void finalizeOMUpgrade() throws Exception { // Wait for the finalization to be marked as done. // 10s timeout should be plenty. await(POLL_MAX_WAIT_MILLIS, POLL_INTERVAL_MILLIS, () -> { - final UpgradeFinalizer.StatusAndMessages progress = + final UpgradeFinalization.StatusAndMessages progress = omClient.queryUpgradeFinalizationProgress( upgradeClientID, false, false); return isDone(progress.status()); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java index 35d5169da97f..da22e52a24f1 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java @@ -310,8 +310,8 @@ import org.apache.hadoop.ozone.snapshot.ListSnapshotResponse; import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse; import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos.PersistedUserVolumeInfo; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; import org.apache.hadoop.ozone.util.OzoneNetUtils; import org.apache.hadoop.ozone.util.OzoneVersionInfo; import org.apache.hadoop.ozone.util.ShutdownHookManager; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequest.java index a5f2e4f8cf0d..b37d1ee6d1dc 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequest.java @@ -40,7 +40,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.FinalizeUpgradeResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java index 39f20076409a..67190972ce23 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java @@ -163,7 +163,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type; import org.apache.hadoop.ozone.security.acl.OzoneObjInfo; import org.apache.hadoop.ozone.snapshot.ListSnapshotResponse; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.apache.hadoop.ozone.util.PayloadUtils; import org.apache.hadoop.ozone.util.ProtobufUtils; import org.slf4j.Logger; diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMUpgradeFinalizer.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMUpgradeFinalizer.java index 55bb36520a80..ac23e47e365e 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMUpgradeFinalizer.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMUpgradeFinalizer.java @@ -19,10 +19,10 @@ import static org.apache.hadoop.ozone.upgrade.LayoutFeature.UpgradeActionType.ON_FINALIZE; import static org.apache.hadoop.ozone.upgrade.UpgradeException.ResultCodes.LAYOUT_FEATURE_FINALIZATION_FAILED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.ALREADY_FINALIZED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_DONE; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED; -import static org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.STARTING_FINALIZATION; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.ALREADY_FINALIZED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_DONE; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.FINALIZATION_REQUIRED; +import static org.apache.hadoop.ozone.upgrade.UpgradeFinalization.Status.STARTING_FINALIZATION; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -44,8 +44,8 @@ import org.apache.hadoop.ozone.om.OzoneManager; import org.apache.hadoop.ozone.upgrade.LayoutFeature; import org.apache.hadoop.ozone.upgrade.UpgradeException; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -109,7 +109,7 @@ public void testReportStatusResultsInFinalizationDone() } StatusAndMessages ret = finalizer.reportStatus(CLIENT_ID, false); - assertEquals(UpgradeFinalizer.Status.FINALIZATION_DONE, ret.status()); + assertEquals(UpgradeFinalization.Status.FINALIZATION_DONE, ret.status()); } @Test @@ -126,7 +126,7 @@ public void testReportStatusAllowsTakeover() } StatusAndMessages ret = finalizer.reportStatus(OTHER_CLIENT_ID, true); - assertEquals(UpgradeFinalizer.Status.FINALIZATION_DONE, ret.status()); + assertEquals(UpgradeFinalization.Status.FINALIZATION_DONE, ret.status()); } @Test diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizationStatusSubCommand.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizationStatusSubCommand.java index 8ed13ec59df9..dcde6618967d 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizationStatusSubCommand.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizationStatusSubCommand.java @@ -21,7 +21,7 @@ import java.util.concurrent.Callable; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import picocli.CommandLine; /** @@ -55,7 +55,7 @@ public Void call() throws Exception { OzoneManagerProtocol client = parent.createOmClient(omServiceId, omHost, false); String upgradeClientID = "Upgrade-Client-" + UUID.randomUUID().toString(); - UpgradeFinalizer.StatusAndMessages progress = + UpgradeFinalization.StatusAndMessages progress = client.queryUpgradeFinalizationProgress(upgradeClientID, false, true); System.out.println(progress.status()); return null; diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizeUpgradeSubCommand.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizeUpgradeSubCommand.java index ef8894187082..3a6f0fc3257a 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizeUpgradeSubCommand.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizeUpgradeSubCommand.java @@ -38,7 +38,7 @@ import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol; import org.apache.hadoop.ozone.upgrade.UpgradeException; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import picocli.CommandLine; /** @@ -85,7 +85,7 @@ public Void call() throws Exception { parent.createOmClient(omServiceId, omHost, forceHA); String upgradeClientID = "Upgrade-Client-" + UUID.randomUUID().toString(); try { - UpgradeFinalizer.StatusAndMessages finalizationResponse = + UpgradeFinalization.StatusAndMessages finalizationResponse = client.finalizeUpgrade(upgradeClientID); if (isFinalized(finalizationResponse.status())) { System.out.println("Upgrade has already been finalized."); @@ -149,7 +149,7 @@ public Void call() throws Exception { Thread.sleep(500); // do not check for exceptions, if one happens during monitoring we // should report it and exit. - UpgradeFinalizer.StatusAndMessages progress = + UpgradeFinalization.StatusAndMessages progress = client.queryUpgradeFinalizationProgress(upgradeClientID, force, false); // this can happen after trying to takeover the request after the fact diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizationScmStatusSubcommand.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizationScmStatusSubcommand.java index e5016186314d..97151c49b0f7 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizationScmStatusSubcommand.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizationScmStatusSubcommand.java @@ -22,7 +22,7 @@ import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.scm.cli.ScmSubcommand; import org.apache.hadoop.hdds.scm.client.ScmClient; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; import picocli.CommandLine; /** @@ -41,7 +41,7 @@ public class FinalizationScmStatusSubcommand extends ScmSubcommand { @Override public void execute(ScmClient client) throws IOException { String upgradeClientID = "Upgrade-Client-" + UUID.randomUUID().toString(); - UpgradeFinalizer.StatusAndMessages progress = + UpgradeFinalization.StatusAndMessages progress = client.queryUpgradeFinalizationProgress(upgradeClientID, false, true); System.out.println(progress.status()); } diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeScmUpgradeSubcommand.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeScmUpgradeSubcommand.java index 4e62edd35d62..63f928e0998d 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeScmUpgradeSubcommand.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeScmUpgradeSubcommand.java @@ -39,8 +39,8 @@ import org.apache.hadoop.hdds.scm.cli.ScmSubcommand; import org.apache.hadoop.hdds.scm.client.ScmClient; import org.apache.hadoop.ozone.upgrade.UpgradeException; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages; import picocli.CommandLine; /** @@ -132,7 +132,7 @@ public Void call() throws Exception { Thread.sleep(500); // do not check for exceptions, if one happens during monitoring we // should report it and exit. - UpgradeFinalizer.StatusAndMessages progress = + UpgradeFinalization.StatusAndMessages progress = client.queryUpgradeFinalizationProgress(upgradeClientID, force, false); // this can happen after trying to takeover the request after the fact diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeUpgradeCommandUtil.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeUpgradeCommandUtil.java index 9e80fab9be12..f46cf83496ca 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeUpgradeCommandUtil.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeUpgradeCommandUtil.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.apache.hadoop.ozone.upgrade.UpgradeException; -import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer; +import org.apache.hadoop.ozone.upgrade.UpgradeFinalization; /** * Base class to help with Upgrade finalization command. @@ -57,20 +57,20 @@ public static void emitExitMsg() { System.out.println("Exiting..."); } - public static boolean isFinalized(UpgradeFinalizer.Status status) { - return status.equals(UpgradeFinalizer.Status.ALREADY_FINALIZED); + public static boolean isFinalized(UpgradeFinalization.Status status) { + return status.equals(UpgradeFinalization.Status.ALREADY_FINALIZED); } - public static boolean isDone(UpgradeFinalizer.Status status) { - return status.equals(UpgradeFinalizer.Status.FINALIZATION_DONE); + public static boolean isDone(UpgradeFinalization.Status status) { + return status.equals(UpgradeFinalization.Status.FINALIZATION_DONE); } - public static boolean isInprogress(UpgradeFinalizer.Status status) { - return status.equals(UpgradeFinalizer.Status.FINALIZATION_IN_PROGRESS); + public static boolean isInprogress(UpgradeFinalization.Status status) { + return status.equals(UpgradeFinalization.Status.FINALIZATION_IN_PROGRESS); } - public static boolean isStarting(UpgradeFinalizer.Status status) { - return status.equals(UpgradeFinalizer.Status.STARTING_FINALIZATION); + public static boolean isStarting(UpgradeFinalization.Status status) { + return status.equals(UpgradeFinalization.Status.STARTING_FINALIZATION); } public static void emitGeneralErrorMsg() {