avijayanhwx commented on a change in pull request #2160:
URL: https://github.com/apache/ozone/pull/2160#discussion_r618086600
##########
File path:
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
##########
@@ -286,6 +286,7 @@ private void testPostUpgradeConditionsDataNodes() {
return false;
}
} catch (IOException e) {
+ LOG.error("Exception. ", e);
Review comment:
Fixed.
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java
##########
@@ -48,22 +51,15 @@ public SCMUpgradeFinalizer(HDDSLayoutVersionManager
versionManager) {
public StatusAndMessages finalize(String upgradeClientID,
StorageContainerManager scm)
throws IOException {
- storageContainerManager = scm;
- StatusAndMessages response = preFinalize(upgradeClientID, scm);
- if (response.status() != FINALIZATION_REQUIRED) {
- return response;
- }
- try {
- getFinalizationExecutor().execute(scm.getScmStorageConfig(), this);
- } catch (Exception e) {
- e.printStackTrace();
- throw new IOException(e.getMessage());
- }
- return STARTING_MSG;
+ return super.finalize(upgradeClientID, scm);
Review comment:
Fixed
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java
##########
@@ -18,27 +18,30 @@
package org.apache.hadoop.hdds.scm.server.upgrade;
-import static
org.apache.hadoop.ozone.upgrade.LayoutFeature.UpgradeActionType.ON_FINALIZE;
-import static
org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.Status.FINALIZATION_REQUIRED;
+import static
org.apache.hadoop.hdds.scm.pipeline.Pipeline.PipelineState.CLOSED;
import java.io.IOException;
-import java.util.Optional;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.upgrade.HDDSLayoutFeature;
import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager;
import org.apache.hadoop.ozone.common.Storage;
import org.apache.hadoop.ozone.upgrade.BasicUpgradeFinalizer;
-import org.apache.hadoop.ozone.upgrade.LayoutFeature.UpgradeAction;
import org.apache.hadoop.ozone.upgrade.UpgradeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* UpgradeFinalizer for the Storage Container Manager service.
*/
public class SCMUpgradeFinalizer extends
BasicUpgradeFinalizer<StorageContainerManager, HDDSLayoutVersionManager> {
- private StorageContainerManager storageContainerManager;
+ private static final Logger LOG =
Review comment:
Fixed
##########
File path:
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java
##########
@@ -41,63 +42,58 @@
BasicUpgradeFinalizer<DatanodeStateMachine, HDDSLayoutVersionManager> {
private static final Logger LOG =
Review comment:
Fixed
##########
File path:
hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/upgrade/InjectedUpgradeFinalizationExecutor.java
##########
@@ -66,38 +65,34 @@ public int getValue() {
}
@Override
- public Void execute(Storage storageConfig,
- BasicUpgradeFinalizer basicUpgradeFinalizer)
- throws Exception {
+ public Void execute(T component, BasicUpgradeFinalizer finalizer)
Review comment:
Fixed
##########
File path:
hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/upgrade/TestDefaultUpgradeFinalizationExecutor.java
##########
@@ -0,0 +1,99 @@
+/**
+ * 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 static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
+import org.apache.hadoop.ozone.common.Storage;
+import org.apache.hadoop.test.LambdaTestUtils;
+import org.junit.Test;
+
+/**
+ * Test for DefaultUpgradeFinalizationExecutor.
+ */
+public class TestDefaultUpgradeFinalizationExecutor {
+
+ @Test
+ public void testPreFinalizeFailureThrowsException() throws Exception {
+ AbstractLayoutVersionManager mockLvm =
+ mock(AbstractLayoutVersionManager.class);
+ when(mockLvm.needsFinalization()).thenReturn(true);
+
+ BasicUpgradeFinalizer uf =
+ new BasicUpgradeFinalizer(mockLvm) {
+ @Override
+ protected void preFinalizeUpgrade(Object service) throws IOException {
+ throw new IOException("Failure!");
+ }
+
+ @Override
+ protected void postFinalizeUpgrade(Object service) {
+ }
+
+ @Override
+ public void finalizeUpgrade(Object service) {
+ }
+
+ @Override
+ public void runPrefinalizeStateActions(Storage storage, Object service) {
+ }
+ };
+
+ DefaultUpgradeFinalizationExecutor executor =
+ new DefaultUpgradeFinalizationExecutor();
+ LambdaTestUtils.intercept(IOException.class,
+ "Failure!", () -> executor.execute(new Object(), uf));
+ }
+
+ @Test
+ public void testPostFinalizeFailureDoesNotThrowException() throws Exception {
+ AbstractLayoutVersionManager mockLvm =
+ mock(AbstractLayoutVersionManager.class);
+ when(mockLvm.needsFinalization()).thenReturn(false);
+
+ BasicUpgradeFinalizer uf =
+ new BasicUpgradeFinalizer(mockLvm) {
+ @Override
+ protected void preFinalizeUpgrade(Object service) {
+ }
+
+ @Override
+ protected void postFinalizeUpgrade(Object service)
+ throws IOException {
+ throw new IOException("Failure!");
+ }
+
+ @Override
+ public void finalizeUpgrade(Object service) {
+ }
+
+ @Override
+ public void runPrefinalizeStateActions(Storage storage,
+ Object service) {
+ }
+ };
+
+ DefaultUpgradeFinalizationExecutor executor =
+ new DefaultUpgradeFinalizationExecutor();
+ executor.execute(new Object(), uf);
+ }
+}
Review comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
