errose28 commented on code in PR #6574: URL: https://github.com/apache/ozone/pull/6574#discussion_r1578558797
########## hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/repair/TestOzoneRepair.java: ########## @@ -0,0 +1,94 @@ +/* + * 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.repair; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.hadoop.fs.ozone.Constants.OZONE_DEFAULT_USER; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; + +/** + * Tests the ozone repair command. + */ +public class TestOzoneRepair { + + private final ByteArrayOutputStream out = new ByteArrayOutputStream(); + private final ByteArrayOutputStream err = new ByteArrayOutputStream(); + private static final PrintStream OLD_OUT = System.out; + private static final PrintStream OLD_ERR = System.err; + private static final String DEFAULT_ENCODING = UTF_8.name(); + + @BeforeEach + public void setup() throws Exception { + System.setOut(new PrintStream(out, false, DEFAULT_ENCODING)); + System.setErr(new PrintStream(err, false, DEFAULT_ENCODING)); + } + + @AfterEach + public void reset() { + // reset stream after each unit test + out.reset(); + err.reset(); + + // restore system streams + System.setOut(OLD_OUT); + System.setErr(OLD_ERR); + } + + @Test + void testOzoneRepairWhenUserIsOzoneDefaultUser() throws Exception { + OzoneRepair ozoneRepair = spy(new OzoneRepair()); + doReturn(OZONE_DEFAULT_USER).when(ozoneRepair).getSystemUserName(); Review Comment: I think you can use `System#setProperty` to alter the perceived user name without needing `spy`. ########## hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/OzoneRepair.java: ########## @@ -61,4 +71,33 @@ public OzoneConfiguration getOzoneConf() { public static void main(String[] argv) throws Exception { new OzoneRepair().run(argv); } + + @Override + public int execute(String[] argv) { + String currentUser = getSystemUserName(); + boolean shouldProceed = true; + if (!currentUser.equals(OZONE_DEFAULT_USER)) { + String s = getConsoleReadLineWithFormat(currentUser, OZONE_DEFAULT_USER); + shouldProceed = Boolean.parseBoolean(s) || "y".equalsIgnoreCase(s); + } + if (!shouldProceed) { + System.out.println("Aborting command."); + return 1; + } + System.out.println("Run as user: " + currentUser); + + TracingUtil.initTracing("shell", createOzoneConfiguration()); + String spanName = "ozone repair " + String.join(" ", argv); + return TracingUtil.executeInNewSpan(spanName, + () -> super.execute(argv)); Review Comment: There's no network calls going out as part of repair commands. They run locally when nodes are stopped, so we don't need request tracing here like have for other commands. ########## hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/OzoneRepair.java: ########## @@ -22,8 +22,11 @@ import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.tracing.TracingUtil; import picocli.CommandLine; +import static org.apache.hadoop.fs.ozone.Constants.OZONE_DEFAULT_USER; Review Comment: This is just used to create a default user directory in the Ozone filesystem. It is not related to the user the OM or any other component is run as, although "hdfs" does happen to be a common choice for that. -- 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]
