errose28 commented on code in PR #10152:
URL: https://github.com/apache/ozone/pull/10152#discussion_r3156884178
##########
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:
This should automatically be propagated back to the client without any extra
handling required.
##########
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/upgrade/FinalizeSubCommand.java:
##########
@@ -0,0 +1,43 @@
+/*
+ * 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 java.io.IOException;
+import org.apache.hadoop.hdds.cli.HddsVersionProvider;
+import org.apache.hadoop.hdds.scm.cli.ScmSubcommand;
+import org.apache.hadoop.hdds.scm.client.ScmClient;
+import picocli.CommandLine;
+
+/**
+ * Sub command to finalize a cluster upgrade.
+ */
[email protected](
+ name = "finalize",
+ description = "Finalize a cluster upgrade",
+ mixinStandardHelpOptions = true,
+ versionProvider = HddsVersionProvider.class)
+public class FinalizeSubCommand extends ScmSubcommand {
+
+ @Override
+ public void execute(ScmClient client) throws IOException {
+ client.finalizeUpgrade();
+
+ out().println("Cluster finalize has been started. Monitor progress with
the ozone admin upgrade status command");
Review Comment:
```suggestion
out().println("Cluster finalization has been started. Monitor progress
with `ozone admin upgrade status`");
```
##########
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:
We will need similar logic in the client itself to support something like
`ozone admin upgrade [finalize/status] --wait`. As part of this change can we
move this somewhere common outside the test scope to avoid having to update all
the tests again later?
##########
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:
Should we combine this and `TestStatusSubCommand` into one test class for
all upgrade subcommands?
##########
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java:
##########
@@ -450,6 +450,8 @@ StatusAndMessages queryUpgradeFinalizationProgress(
String upgradeClientID, boolean force, boolean readonly)
throws IOException;
+ void finalizeUpgrade() throws IOException;
Review Comment:
Should we `@Deprecate` the old method, even though it should continue to
work?
--
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]
