dlg99 commented on a change in pull request #2947:
URL: https://github.com/apache/bookkeeper/pull/2947#discussion_r785038628
##########
File path:
bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
##########
@@ -616,6 +617,24 @@ public void safeRun() {
void checkForFaultyBookies() {
List<BookieId> faultyBookies = bookieClient.getFaultyBookies();
+ if (faultyBookies.isEmpty()) {
+ return;
+ }
+
+ boolean isEnable = false;
Review comment:
nit: `isEnabled` (here and in other places)
##########
File path:
bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java
##########
@@ -260,6 +270,62 @@ public synchronized LedgerManagerFactory
getLedgerManagerFactory()
return lmFactory;
}
+ public CompletableFuture<Void> disableHealthCheck() {
+ CompletableFuture<Void> createResult = new CompletableFuture<>();
+ zk.create(disableHealthCheckPath,
BookKeeperConstants.EMPTY_BYTE_ARRAY, acls,
+ CreateMode.PERSISTENT, new AsyncCallback.StringCallback() {
+ @Override
+ public void processResult(int rc, String path, Object ctx, String
name) {
+ if (KeeperException.Code.OK.intValue() == rc) {
+ createResult.complete(null);
+ } else if (KeeperException.Code.NODEEXISTS.intValue() == rc) {
+ log.debug("health check already disable!");
Review comment:
```suggestion
log.debug("health check already disabled!");
```
##########
File path:
bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/health/SwitchOfHealthCheckCommand.java
##########
@@ -0,0 +1,116 @@
+/*
+ * 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.bookkeeper.tools.cli.commands.health;
+
+import com.beust.jcommander.Parameter;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import java.util.concurrent.ExecutionException;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.meta.MetadataDrivers;
+import org.apache.bookkeeper.meta.exceptions.MetadataException;
+import org.apache.bookkeeper.tools.cli.helpers.BookieCommand;
+import org.apache.bookkeeper.tools.framework.CliFlags;
+import org.apache.bookkeeper.tools.framework.CliSpec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+/**
+ * Command to enable or disable health check in the cluster.
+ */
+public class SwitchOfHealthCheckCommand extends
BookieCommand<SwitchOfHealthCheckCommand.HealthCheckFlags> {
+
+ static final Logger LOG =
LoggerFactory.getLogger(SwitchOfHealthCheckCommand.class);
+
+ private static final String NAME = "switch";
+ private static final String DESC = "Enable or disable health check in the
cluster. Default is enable.";
Review comment:
```suggestion
private static final String DESC = "Enables or disables health check in
the cluster. Default is enabled.";
```
##########
File path:
bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/health/SwitchOfHealthCheckCommand.java
##########
@@ -0,0 +1,116 @@
+/*
+ * 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.bookkeeper.tools.cli.commands.health;
+
+import com.beust.jcommander.Parameter;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import java.util.concurrent.ExecutionException;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.meta.MetadataDrivers;
+import org.apache.bookkeeper.meta.exceptions.MetadataException;
+import org.apache.bookkeeper.tools.cli.helpers.BookieCommand;
+import org.apache.bookkeeper.tools.framework.CliFlags;
+import org.apache.bookkeeper.tools.framework.CliSpec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+/**
+ * Command to enable or disable health check in the cluster.
+ */
+public class SwitchOfHealthCheckCommand extends
BookieCommand<SwitchOfHealthCheckCommand.HealthCheckFlags> {
+
+ static final Logger LOG =
LoggerFactory.getLogger(SwitchOfHealthCheckCommand.class);
+
+ private static final String NAME = "switch";
+ private static final String DESC = "Enable or disable health check in the
cluster. Default is enable.";
+
+ public SwitchOfHealthCheckCommand() {
+ this(new HealthCheckFlags());
+ }
+
+ private SwitchOfHealthCheckCommand(HealthCheckFlags flags) {
+ super(CliSpec.<HealthCheckFlags>newBuilder()
+ .withName(NAME).withDescription(DESC)
+ .withFlags(flags).build());
+ }
+
+ /**
+ * Flags for health check command.
+ */
+ @Accessors(fluent = true)
+ @Setter
+ public static class HealthCheckFlags extends CliFlags {
+
+ @Parameter(names = { "-e", "--enable" }, description = "Enable or
disable health check.")
+ private boolean enable;
+
+ @Parameter(names = {"-s", "--status"}, description = "Check the health
check status.")
+ private boolean status;
+
+ }
+
+ @Override
+ public boolean apply(ServerConfiguration conf, HealthCheckFlags cmdFlags) {
+ try {
+ return handler(conf, cmdFlags);
+ } catch (MetadataException | ExecutionException e) {
+ throw new UncheckedExecutionException(e.getMessage(), e);
+ }
+ }
+
+ private boolean handler(ServerConfiguration conf, HealthCheckFlags flags)
+ throws MetadataException, ExecutionException {
+
+ MetadataDrivers.runFunctionWithMetadataBookieDriver(conf, driver -> {
+ try {
+ boolean isEnable = driver.isHealthCheckEnabled().get();
+
+ if (flags.status) {
+ LOG.info("EnableHealthCheck is " + (isEnable ? "enabled."
: "disabled."));
+ return null;
+ }
+
+ if (flags.enable) {
+ if (isEnable) {
+ LOG.warn("HealthCheck already enable. Doing nothing");
+ } else {
+ LOG.info("Enable HealthCheck");
+ driver.enableHealthCheck().get();
+ }
+ } else {
+ if (!isEnable) {
+ LOG.warn("HealthCheck already disable. Doing nothing");
Review comment:
"already disabled"
##########
File path:
bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/health/SwitchOfHealthCheckCommand.java
##########
@@ -0,0 +1,116 @@
+/*
+ * 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.bookkeeper.tools.cli.commands.health;
+
+import com.beust.jcommander.Parameter;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import java.util.concurrent.ExecutionException;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.meta.MetadataDrivers;
+import org.apache.bookkeeper.meta.exceptions.MetadataException;
+import org.apache.bookkeeper.tools.cli.helpers.BookieCommand;
+import org.apache.bookkeeper.tools.framework.CliFlags;
+import org.apache.bookkeeper.tools.framework.CliSpec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+/**
+ * Command to enable or disable health check in the cluster.
+ */
+public class SwitchOfHealthCheckCommand extends
BookieCommand<SwitchOfHealthCheckCommand.HealthCheckFlags> {
+
+ static final Logger LOG =
LoggerFactory.getLogger(SwitchOfHealthCheckCommand.class);
+
+ private static final String NAME = "switch";
+ private static final String DESC = "Enable or disable health check in the
cluster. Default is enable.";
+
+ public SwitchOfHealthCheckCommand() {
+ this(new HealthCheckFlags());
+ }
+
+ private SwitchOfHealthCheckCommand(HealthCheckFlags flags) {
+ super(CliSpec.<HealthCheckFlags>newBuilder()
+ .withName(NAME).withDescription(DESC)
+ .withFlags(flags).build());
+ }
+
+ /**
+ * Flags for health check command.
+ */
+ @Accessors(fluent = true)
+ @Setter
+ public static class HealthCheckFlags extends CliFlags {
+
+ @Parameter(names = { "-e", "--enable" }, description = "Enable or
disable health check.")
+ private boolean enable;
+
+ @Parameter(names = {"-s", "--status"}, description = "Check the health
check status.")
+ private boolean status;
+
+ }
+
+ @Override
+ public boolean apply(ServerConfiguration conf, HealthCheckFlags cmdFlags) {
+ try {
+ return handler(conf, cmdFlags);
+ } catch (MetadataException | ExecutionException e) {
+ throw new UncheckedExecutionException(e.getMessage(), e);
+ }
+ }
+
+ private boolean handler(ServerConfiguration conf, HealthCheckFlags flags)
+ throws MetadataException, ExecutionException {
+
+ MetadataDrivers.runFunctionWithMetadataBookieDriver(conf, driver -> {
+ try {
+ boolean isEnable = driver.isHealthCheckEnabled().get();
+
+ if (flags.status) {
+ LOG.info("EnableHealthCheck is " + (isEnable ? "enabled."
: "disabled."));
+ return null;
+ }
+
+ if (flags.enable) {
+ if (isEnable) {
+ LOG.warn("HealthCheck already enable. Doing nothing");
Review comment:
"already enabled"
--
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]
