[GitHub] [incubator-pinot] Jackie-Jiang commented on a change in pull request #6586: Server `queriesDisabled` metric:

[GitBox <gi...@apache.org>]

Jackie-Jiang commented on a change in pull request #6586:
URL: https://github.com/apache/incubator-pinot/pull/6586#discussion_r577930388



##########
File path: pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/Instance.java
##########
@@ -98,4 +101,8 @@ public InstanceType getType() {
   public int getGrpcPort() {
     return _grpcPort;
   }
+
+  public boolean getQueriesDisabled() {

Review comment:
       ```suggestion
     public boolean isQueriesDisabled() {
   ```

##########
File path: pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
##########
@@ -431,6 +435,7 @@ public synchronized PinotResourceManagerResponse updateInstance(String instanceI
       return PinotResourceManagerResponse.failure("Instance " + instanceIdToUpdate + " does not exists");
     } else {
       InstanceConfig newConfig = InstanceUtils.toHelixInstanceConfig(newInstance);
+      newConfig.getRecord().setBooleanField(Helix.QUERIES_DISABLED, newInstance.getQueriesDisabled());

Review comment:
       Only set `Helix.QUERIES_DISABLED` when queries are disabled to be consistent with `addInstance()`

##########
File path: pinot-server/src/main/java/org/apache/pinot/server/starter/ServerQueriesDisabledTracker.java
##########
@@ -0,0 +1,90 @@
+/**
+ * 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.pinot.server.starter;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.helix.HelixManager;
+import org.apache.helix.ZNRecord;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A class to track if the server is queries disabled.
+ */
+public class ServerQueriesDisabledTracker {
+  private static final Logger LOGGER = LoggerFactory.getLogger(ServerQueriesDisabledTracker.class);
+  private static final long FETCH_INTERVAL_MINS = 10L;
+  private static ServerQueriesDisabledTracker _singletonInstance;
+
+  private final ScheduledExecutorService _executorService = Executors.newSingleThreadScheduledExecutor();
+  private final HelixManager _helixManager;
+  private final ServerMetrics _serverMetrics;
+  private final String _clusterName;
+  private final String _instanceId;
+  private AtomicBoolean _queriesDisabled = new AtomicBoolean();
+
+  private ServerQueriesDisabledTracker(
+      String helixClusterName, String instanceId, HelixManager helixManager, ServerMetrics serverMetrics) {
+    _helixManager = helixManager;
+    _serverMetrics = serverMetrics;
+    _clusterName = helixClusterName;
+    _instanceId = instanceId;
+  }
+
+  public static synchronized void init(
+      String helixClusterName, String instanceId, HelixManager helixManager, ServerMetrics serverMetrics) {
+    if (_singletonInstance == null) {
+        _singletonInstance = new ServerQueriesDisabledTracker(helixClusterName, instanceId, helixManager, serverMetrics);
+    }
+  }
+
+  public static synchronized ServerQueriesDisabledTracker getInstance() {
+    if (_singletonInstance == null) {
+      throw new RuntimeException(ServerQueriesDisabledTracker.class.getName() + " has not been initialized.");
+    }
+    return _singletonInstance;
+  }
+
+  public void start() {
+    _serverMetrics.addCallbackGauge(CommonConstants.Helix.QUERIES_DISABLED, () -> _queriesDisabled.get() ? 1L : 0L);
+    LOGGER.info("Tracking server queries disabled.");
+    _executorService.scheduleWithFixedDelay(() -> {
+      ZNRecord instanceConfigZNRecord = _helixManager.getConfigAccessor().getInstanceConfig(_clusterName, _instanceId).getRecord();
+      if (instanceConfigZNRecord == null) {
+        LOGGER.error("Failed to get instance config: {} in {} from zookeeper" , _instanceId, _clusterName);
+      } else {
+        if ("true".equals(instanceConfigZNRecord.getSimpleField(CommonConstants.Helix.QUERIES_DISABLED))) {
+          _queriesDisabled.set(true);
+        } else {
+          _queriesDisabled.set(false);
+        }

Review comment:
       ```suggestion
           _queriesDisabled.set(instanceConfigZNRecord.getBooleanField(CommonConstants.Helix.QUERIES_DISABLED, false));
   ```

##########
File path: pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
##########
@@ -418,7 +418,11 @@ public synchronized PinotResourceManagerResponse addInstance(Instance instance)
     if (instances.contains(instanceIdToAdd)) {
       return PinotResourceManagerResponse.failure("Instance " + instanceIdToAdd + " already exists");
     } else {
-      _helixAdmin.addInstance(_helixClusterName, InstanceUtils.toHelixInstanceConfig(instance));
+      InstanceConfig instanceConfig = InstanceUtils.toHelixInstanceConfig(instance);
+      if (instance.getQueriesDisabled()) {
+        instanceConfig.getRecord().setBooleanField(Helix.QUERIES_DISABLED, instance.getQueriesDisabled());

Review comment:
       (nit)
   ```suggestion
           instanceConfig.getRecord().setBooleanField(Helix.QUERIES_DISABLED, true);
   ```

##########
File path: pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
##########
@@ -104,6 +105,10 @@ public String getInstance(
     response.set("tags", JsonUtils.objectToJsonNode(instanceConfig.getTags()));
     response.set("pools", JsonUtils.objectToJsonNode(instanceConfig.getRecord().getMapField(InstanceUtils.POOL_KEY)));
     response.put("grpcPort", getGrpcPort(instanceConfig));
+    String queriesDisabled = instanceConfig.getRecord().getSimpleField(CommonConstants.Helix.QUERIES_DISABLED);
+    if ("true".equals(queriesDisabled) || "false".equals(queriesDisabled)) {

Review comment:
       Suggest adding it only when `queriesDisabled` is true




----------------------------------------------------------------
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



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org