errose28 commented on code in PR #10152:
URL: https://github.com/apache/ozone/pull/10152#discussion_r3163701943
##########
hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java:
##########
@@ -115,6 +115,23 @@ public StatusAndMessages finalize(String upgradeClientID,
T service)
}
}
+ @Override
+ public void finalize(T service) throws IOException {
+ UpgradeFinalization.Status status = versionManager.getUpgradeState();
+ if (isFinalized(status)) {
+ return;
+ }
+ try {
+ if (status == FINALIZATION_REQUIRED) {
+ finalizationExecutor.execute(service, this);
+ }
+ } catch (NotLeaderException e) {
Review Comment:
I don't think the catch or log is necessary. This is now a single ratis
request so it works the same as others like close container, close pipeline,
etc. If the contacted node is not the leader the finalization will not happen
at all and the client's failover proxy should retry on the leader automatically.
##########
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/admin/upgrade/TestFinalizeSubCommand.java:
##########
@@ -0,0 +1,68 @@
+/*
+ * 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.admin.upgrade;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import org.apache.hadoop.hdds.scm.client.ScmClient;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import picocli.CommandLine;
+
+/**
+ * Unit tests for {@link FinalizeSubCommand}.
+ */
+public class TestFinalizeSubCommand {
Review Comment:
Ok let's leave it as is for now.
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHddsUpgradeUtils.java:
##########
@@ -50,16 +49,16 @@ public final class TestHddsUpgradeUtils {
private TestHddsUpgradeUtils() { }
+ // This is currently testing that the SCM and datanode side finalization is
complete.
+ // TODO - should this test for SCM and DNs and OM?
public static void waitForFinalizationFromClient(
Review Comment:
I'm good with the latest implementation where the finalization criteria is
separated out since we may want to update that separately. Tests and CLI may
want to configure their waiting differently, and will be writing intermediate
output to different places as they wait.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
