Enhance SegmentStatusChecker to honor no-queryable servers and instance assignment config #14536
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,95 @@ | ||||||||
| /** | ||||||||
| * 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.controller.util; | ||||||||
|
|
||||||||
| import java.util.HashMap; | ||||||||
| import java.util.List; | ||||||||
| import java.util.Map; | ||||||||
| import javax.annotation.Nullable; | ||||||||
| import org.apache.helix.model.InstanceConfig; | ||||||||
| import org.apache.helix.zookeeper.datamodel.ZNRecord; | ||||||||
| import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; | ||||||||
| import org.apache.pinot.spi.utils.CommonConstants; | ||||||||
| import org.apache.pinot.spi.utils.InstanceTypeUtils; | ||||||||
|
|
||||||||
|
|
||||||||
| /** | ||||||||
| * This is a helper class that fetch server information from Helix/ZK. It caches the server information to avoid | ||||||||
| * repeated ZK access. This class is NOT thread-safe. | ||||||||
| */ | ||||||||
| public class ServerQueryInfoFetcher { | ||||||||
| private final PinotHelixResourceManager _pinotHelixResourceManager; | ||||||||
| private final Map<String, ServerQueryInfo> _cache; | ||||||||
|
|
||||||||
| public ServerQueryInfoFetcher(PinotHelixResourceManager pinotHelixResourceManager) { | ||||||||
| _pinotHelixResourceManager = pinotHelixResourceManager; | ||||||||
| _cache = new HashMap<>(); | ||||||||
| } | ||||||||
|
|
||||||||
| @Nullable | ||||||||
| public ServerQueryInfo getServerQueryInfo(String instanceId) { | ||||||||
|
There was a problem hiding this comment. Annotate the return as |
||||||||
| return _cache.computeIfAbsent(instanceId, this::getServerQueryInfoOndemand); | ||||||||
| } | ||||||||
|
|
||||||||
| @Nullable | ||||||||
| private ServerQueryInfo getServerQueryInfoOndemand(String instanceId) { | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| InstanceConfig instanceConfig = _pinotHelixResourceManager.getHelixInstanceConfig(instanceId); | ||||||||
| if (instanceConfig == null || !InstanceTypeUtils.isServer(instanceId)) { | ||||||||
| return null; | ||||||||
| } | ||||||||
| List<String> tags = instanceConfig.getTags(); | ||||||||
| ZNRecord record = instanceConfig.getRecord(); | ||||||||
| boolean helixEnabled = instanceConfig.getInstanceEnabled(); | ||||||||
| boolean queriesDisabled = record.getBooleanField(CommonConstants.Helix.QUERIES_DISABLED, false); | ||||||||
| boolean shutdownInProgress = record.getBooleanField(CommonConstants.Helix.IS_SHUTDOWN_IN_PROGRESS, false); | ||||||||
|
|
||||||||
| return new ServerQueryInfo(instanceId, tags, null, helixEnabled, queriesDisabled, shutdownInProgress); | ||||||||
| } | ||||||||
|
|
||||||||
| public static class ServerQueryInfo { | ||||||||
|
There was a problem hiding this comment. We shouldn't need setters for this class, and we can make all fields There was a problem hiding this comment. Seems most of the fields are not used. Are you planning to use them? There was a problem hiding this comment.
Yes, @jasperjiaguo will need those fields very soon |
||||||||
| private final String _instanceName; | ||||||||
| private final List<String> _tags; | ||||||||
| private final List<String> _tables; | ||||||||
| private final boolean _helixEnabled; | ||||||||
| private final boolean _queriesDisabled; | ||||||||
| private final boolean _shutdownInProgress; | ||||||||
|
|
||||||||
| private ServerQueryInfo(String instanceName, List<String> tags, List<String> tables, boolean helixEnabled, | ||||||||
| boolean queriesDisabled, boolean shutdownInProgress) { | ||||||||
| _instanceName = instanceName; | ||||||||
| _tags = tags; | ||||||||
| _tables = tables; | ||||||||
| _helixEnabled = helixEnabled; | ||||||||
| _queriesDisabled = queriesDisabled; | ||||||||
| _shutdownInProgress = shutdownInProgress; | ||||||||
| } | ||||||||
|
|
||||||||
| public boolean isHelixEnabled() { | ||||||||
| return _helixEnabled; | ||||||||
| } | ||||||||
|
|
||||||||
| public boolean isQueriesDisabled() { | ||||||||
| return _queriesDisabled; | ||||||||
| } | ||||||||
|
|
||||||||
| public boolean isShutdownInProgress() { | ||||||||
| return _shutdownInProgress; | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sajjad-moradi This log need to be deleted, as
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add some new logging instead? Meanwhile, it would be great if we have a list of segments having min replicas and print them out as well? I feel sometimes the debuggability of alerts on this metric is not so great.nvm [L388-L392] should be good