You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jira@kafka.apache.org by GitBox <gi...@apache.org> on 2021/02/10 22:56:55 UTC
[GitHub] [kafka] soarez commented on a change in pull request #10094: MINOR: Add the KIP-500 metadata shell
soarez commented on a change in pull request #10094:
URL: https://github.com/apache/kafka/pull/10094#discussion_r574130615
##########
File path: shell/src/main/java/org/apache/kafka/shell/InteractiveShell.java
##########
@@ -0,0 +1,174 @@
+/*
+ * 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.kafka.shell;
+
+import org.jline.reader.Candidate;
+import org.jline.reader.Completer;
+import org.jline.reader.EndOfFileException;
+import org.jline.reader.History;
+import org.jline.reader.LineReader;
+import org.jline.reader.LineReaderBuilder;
+import org.jline.reader.ParsedLine;
+import org.jline.reader.Parser;
+import org.jline.reader.UserInterruptException;
+import org.jline.reader.impl.DefaultParser;
+import org.jline.reader.impl.history.DefaultHistory;
+import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
+
+import java.io.IOException;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+
+/**
+ * The Kafka metadata shell.
+ */
+public final class InteractiveShell implements AutoCloseable {
+ static class MetadataShellCompleter implements Completer {
+ private final MetadataNodeManager nodeManager;
+
+ MetadataShellCompleter(MetadataNodeManager nodeManager) {
+ this.nodeManager = nodeManager;
+ }
+
+ @Override
+ public void complete(LineReader reader, ParsedLine line, List<Candidate> candidates) {
+ if (line.words().size() == 0) {
+ CommandUtils.completeCommand("", candidates);
+ } else if (line.words().size() == 1) {
+ CommandUtils.completeCommand(line.words().get(0), candidates);
+ } else {
+ Iterator<String> iter = line.words().iterator();
+ String command = iter.next();
+ List<String> nextWords = new ArrayList<>();
+ while (iter.hasNext()) {
+ nextWords.add(iter.next());
+ }
+ Commands.Type type = Commands.TYPES.get(command);
+ if (type == null) {
+ return;
+ }
+ try {
+ type.completeNext(nodeManager, nextWords, candidates);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ private final MetadataNodeManager nodeManager;
+ private final Terminal terminal;
+ private final Parser parser;
+ private final History history;
+ private final MetadataShellCompleter completer;
+ private final LineReader reader;
+
+ public InteractiveShell(MetadataNodeManager nodeManager) throws IOException {
+ this.nodeManager = nodeManager;
+ TerminalBuilder builder = TerminalBuilder.builder().
+ system(true).
+ nativeSignals(true);
+ this.terminal = builder.build();
+ this.parser = new DefaultParser();
+ this.history = new DefaultHistory();
+ this.completer = new MetadataShellCompleter(nodeManager);
+ this.reader = LineReaderBuilder.builder().
+ terminal(terminal).
+ parser(parser).
+ history(history).
+ completer(completer).
+ option(LineReader.Option.AUTO_FRESH_LINE, false).
+ build();
+ }
+
+ public void runMainLoop() throws Exception {
+ terminal.writer().println("[ Kafka Metadata Shell ]");
+ terminal.flush();
+ Commands commands = new Commands(true);
+ while (true) {
+ try {
+ reader.readLine(">> ");
+ ParsedLine parsedLine = reader.getParsedLine();
+ Commands.Handler handler = commands.parseCommand(parsedLine.words());
+ handler.run(Optional.of(this), terminal.writer(), nodeManager);
+ terminal.writer().flush();
+ } catch (UserInterruptException eof) {
+ // Handle ths user pressing Control-C.
Review comment:
typo
##########
File path: metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.kafka.metalog;
+
+import org.apache.kafka.common.metadata.RegisterBrokerRecord;
+import org.apache.kafka.metadata.ApiMessageAndVersion;
+import org.apache.kafka.test.TestUtils;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.apache.kafka.metalog.MockMetaLogManagerListener.COMMIT;
+import static org.apache.kafka.metalog.MockMetaLogManagerListener.LAST_COMMITTED_OFFSET;
+import static org.apache.kafka.metalog.MockMetaLogManagerListener.SHUTDOWN;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
+@Timeout(value = 40)
+public class LocalLogManagerTest {
+ private static final Logger log = LoggerFactory.getLogger(LocalLogManagerTest.class);
+
+ /**
+ * Test creating a LocalLogManager and closing it.
+ */
+ @Test
+ public void testCreateAndClose() throws Exception {
+ try (LocalLogManagerTestEnv env =
+ LocalLogManagerTestEnv.createWithMockListeners(1)) {
+ env.close();
+ assertEquals(null, env.firstError.get());
+ }
+ }
+
+ /**
+ * Test that the local log maanger will claim leadership.
Review comment:
Typo
##########
File path: shell/src/main/java/org/apache/kafka/shell/CommandUtils.java
##########
@@ -0,0 +1,151 @@
+/*
+ * 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.kafka.shell;
+
+import org.apache.kafka.shell.MetadataNode.DirectoryNode;
+import org.jline.reader.Candidate;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+
+/**
+ * Utility functions for command handlers.
+ */
+public final class CommandUtils {
+ /**
+ * Convert a list of paths into the effective list of paths which should be used.
+ * Empty strings will be removed. If no paths are given, the current working
+ * directory will be used.
+ *
+ * @param paths The input paths. Non-null.
+ *
+ * @return The output paths.
+ */
+ public static List<String> getEffectivePaths(List<String> paths) {
+ List<String> effectivePaths = new ArrayList<>();
+ for (String path : paths) {
+ if (!path.isEmpty()) {
+ effectivePaths.add(path);
+ }
+ }
+ if (effectivePaths.isEmpty()) {
+ effectivePaths.add(".");
+ }
+ return effectivePaths;
+ }
+
+ /**
+ * Generate a list of potential completions for a prefix of a command name.
+ *
+ * @param commandPrefix The command prefix. Non-null.
+ * @param candidates The list to add the output completions to.
+ */
+ public static void completeCommand(String commandPrefix, List<Candidate> candidates) {
+ String command = Commands.TYPES.ceilingKey(commandPrefix);
+ while (true) {
+ if (command == null || !command.startsWith(commandPrefix)) {
+ return;
+ }
Review comment:
```suggestion
while (command != null && command.startsWith(commandPrefix)) {
```
----------------------------------------------------------------
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:
users@infra.apache.org