-
Notifications
You must be signed in to change notification settings - Fork 3.4k
HBASE-29526 Dynamic configuration not working for coprocessor #7543
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: branch-2.6
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,11 +17,14 @@ | |
| */ | ||
| package org.apache.hadoop.hbase.util; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; | ||
| import org.apache.yetus.audience.InterfaceAudience; | ||
|
|
||
| import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; | ||
| import org.apache.hbase.thirdparty.com.google.common.base.Strings; | ||
|
|
||
| /** | ||
| * Helper class for coprocessor host when configuration changes. | ||
|
|
@@ -32,19 +35,71 @@ public final class CoprocessorConfigurationUtil { | |
| private CoprocessorConfigurationUtil() { | ||
| } | ||
|
|
||
| public static boolean checkConfigurationChange(Configuration oldConfig, Configuration newConfig, | ||
| String... configurationKey) { | ||
| /** | ||
| * Check configuration change by comparing current loaded coprocessors with configuration values. | ||
| * This method is useful when the configuration object has been updated but we need to determine | ||
| * if coprocessor configuration has actually changed compared to what's currently loaded. | ||
| * <p> | ||
| * <b>Note:</b> This method only detects changes in the set of coprocessor class names. It does | ||
| * <b>not</b> detect changes to priority or path for coprocessors that are already loaded with the | ||
| * same class name. If you need to update the priority or path of an existing coprocessor, you | ||
| * must restart the region/regionserver/master. | ||
| * @param coprocessorHost the coprocessor host to check current loaded coprocessors (can be null) | ||
| * @param conf the configuration to check | ||
| * @param configurationKey the configuration keys to check | ||
| * @return true if configuration has changed, false otherwise | ||
| */ | ||
| public static boolean checkConfigurationChange(CoprocessorHost<?, ?> coprocessorHost, | ||
| Configuration conf, String... configurationKey) { | ||
| Preconditions.checkArgument(configurationKey != null, "Configuration Key(s) must be provided"); | ||
| boolean isConfigurationChange = false; | ||
| Preconditions.checkArgument(conf != null, "Configuration must be provided"); | ||
|
|
||
| if ( | ||
| !conf.getBoolean(CoprocessorHost.COPROCESSORS_ENABLED_CONF_KEY, | ||
| CoprocessorHost.DEFAULT_COPROCESSORS_ENABLED) | ||
| ) { | ||
| return false; | ||
| } | ||
|
|
||
| if (coprocessorHost == null) { | ||
| // If no coprocessor host exists, check if any coprocessors are now configured | ||
| return hasCoprocessorsConfigured(conf, configurationKey); | ||
| } | ||
|
|
||
| // Get currently loaded coprocessor class names | ||
| Set<String> currentlyLoaded = coprocessorHost.getCoprocessorClassNames(); | ||
|
|
||
| // Get coprocessor class names from configuration | ||
| // Only class names are compared; priority and path changes are not detected | ||
| Set<String> configuredClasses = new HashSet<>(); | ||
| for (String key : configurationKey) { | ||
| String[] classes = conf.getStrings(key); | ||
| if (classes != null) { | ||
| for (String className : classes) { | ||
| // Handle the className|priority|path format | ||
| String[] classNameToken = className.split("\\|"); | ||
| String actualClassName = classNameToken[0].trim(); | ||
| if (!Strings.isNullOrEmpty(actualClassName)) { | ||
| configuredClasses.add(actualClassName); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Compare the two sets | ||
| return !currentlyLoaded.equals(configuredClasses); | ||
| } | ||
|
|
||
| /** | ||
| * Helper method to check if there are any coprocessors configured. | ||
| */ | ||
| private static boolean hasCoprocessorsConfigured(Configuration conf, String... configurationKey) { | ||
| for (String key : configurationKey) { | ||
| String oldValue = oldConfig.get(key); | ||
| String newValue = newConfig.get(key); | ||
| // check if the coprocessor key has any difference | ||
| if (!StringUtils.equalsIgnoreCase(oldValue, newValue)) { | ||
| isConfigurationChange = true; | ||
| break; | ||
| String[] coprocessors = conf.getStrings(key); | ||
| if (coprocessors != null && coprocessors.length > 0) { | ||
| return true; | ||
| } | ||
| } | ||
| return isConfigurationChange; | ||
| return false; | ||
| } | ||
| } | ||
|
Comment on lines
+38
to
105
|
||
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.
The hasCoprocessorsConfigured method does not properly validate coprocessor entries. It returns true if the array is non-empty, but doesn't check if the entries contain actual coprocessor class names (they could be empty strings or whitespace). This could cause the method to return true even when no valid coprocessors are configured.
Consider checking if any of the entries actually contain non-empty class names after parsing, similar to how configuredClasses is built in checkConfigurationChange.