diff --git a/CHANGES.txt b/CHANGES.txt index cbe2ccad5c..ac23818c0f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035) * Add algorithmic token allocation (CASSANDRA-7032) * Add nodetool command to replay batchlog (CASSANDRA-9547) * Make file buffer cache independent of paths being read (CASSANDRA-8897) diff --git a/NEWS.txt b/NEWS.txt index b664e6ab89..3a9fe6af04 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -25,7 +25,9 @@ Upgrading use CqlInputFormat and CqlOutputFormat instead. - Hadoop ColumnFamilyRecordReader and ColumnFamilyRecordWriter have been removed; use CqlRecordReader and CqlRecordWriter instead. - + - hinted_handoff_enabled in cassandra.yaml no longer supports a list of data centers. + To specify a list of excluded data centers when hinted_handoff_enabled is set to true, + use hinted_handoff_disabled_datacenters, see CASSANDRA-9035 for details. 2.2 === diff --git a/build.xml b/build.xml index 7c05d7fec3..a61913b824 100644 --- a/build.xml +++ b/build.xml @@ -404,13 +404,12 @@ --> - - + - + @@ -517,7 +516,6 @@ - diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 71e0a8132f..dc9a7eaadc 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -42,10 +42,13 @@ num_tokens: 256 # initial_token: # See http://wiki.apache.org/cassandra/HintedHandoff -# May either be "true" or "false" to enable globally, or contain a list -# of data centers to enable per-datacenter. -# hinted_handoff_enabled: DC1,DC2 +# May either be "true" or "false" to enable globally hinted_handoff_enabled: true +# When hinted_handoff_enabled is true, a black list of data centers that will not +# perform hinted handoff +#hinted_handoff_disabled_datacenters: +# - DC1 +# - DC2 # this defines the maximum amount of time a dead host will have hints # generated. After it has been dead this long, new hints for it will not be # created until it has been seen alive and gone down again. diff --git a/lib/licenses/super-csv-2.1.0.txt b/lib/licenses/super-csv-2.1.0.txt deleted file mode 100644 index d645695673..0000000000 --- a/lib/licenses/super-csv-2.1.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 54005e994d..a1104e5885 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -17,9 +17,6 @@ */ package org.apache.cassandra.config; -import java.io.IOException; -import java.io.StringReader; -import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -27,9 +24,6 @@ import com.google.common.collect.Sets; import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions; -import org.apache.cassandra.exceptions.ConfigurationException; -import org.supercsv.io.CsvListReader; -import org.supercsv.prefs.CsvPreference; /** * A class that contains configuration properties for the cassandra node it runs within. @@ -59,9 +53,8 @@ public class Config public String partitioner; public Boolean auto_bootstrap = true; - public volatile boolean hinted_handoff_enabled_global = true; - public String hinted_handoff_enabled; - public Set hinted_handoff_enabled_by_dc = Sets.newConcurrentHashSet(); + public volatile boolean hinted_handoff_enabled = true; + public Set hinted_handoff_disabled_datacenters = Sets.newConcurrentHashSet(); public volatile Integer max_hint_window_in_ms = 3 * 3600 * 1000; // three hours public ParameterizedClass seed_provider; @@ -240,9 +233,6 @@ public class Config public volatile Long index_summary_capacity_in_mb; public volatile int index_summary_resize_interval_in_minutes = 60; - private static final CsvPreference STANDARD_SURROUNDING_SPACES_NEED_QUOTES = new CsvPreference.Builder(CsvPreference.STANDARD_PREFERENCE) - .surroundingSpacesNeedQuotes(true).build(); - // TTL for different types of trace events. public int tracetype_query_ttl = (int) TimeUnit.DAYS.toSeconds(1); public int tracetype_repair_ttl = (int) TimeUnit.DAYS.toSeconds(7); @@ -287,40 +277,6 @@ public class Config isClientMode = clientMode; } - public void configHintedHandoff() throws ConfigurationException - { - if (hinted_handoff_enabled != null && !hinted_handoff_enabled.isEmpty()) - { - if (hinted_handoff_enabled.equalsIgnoreCase("true")) - { - hinted_handoff_enabled_global = true; - } - else if (hinted_handoff_enabled.equalsIgnoreCase("false")) - { - hinted_handoff_enabled_global = false; - } - else - { - try - { - hinted_handoff_enabled_by_dc.addAll(parseHintedHandoffEnabledDCs(hinted_handoff_enabled)); - } - catch (IOException e) - { - throw new ConfigurationException("Invalid hinted_handoff_enabled parameter " + hinted_handoff_enabled, e); - } - } - } - } - - public static List parseHintedHandoffEnabledDCs(final String dcNames) throws IOException - { - try (final CsvListReader csvListReader = new CsvListReader(new StringReader(dcNames), STANDARD_SURROUNDING_SPACES_NEED_QUOTES)) - { - return csvListReader.read(); - } - } - public static enum CommitLogSync { periodic, diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index f0dda099db..47d81abe2d 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -1358,47 +1358,27 @@ public class DatabaseDescriptor public static void setHintedHandoffEnabled(boolean hintedHandoffEnabled) { - conf.hinted_handoff_enabled_global = hintedHandoffEnabled; - conf.hinted_handoff_enabled_by_dc.clear(); - } - - public static void setHintedHandoffEnabled(final String dcNames) - { - List dcNameList; - try - { - dcNameList = Config.parseHintedHandoffEnabledDCs(dcNames); - } - catch (IOException e) - { - throw new IllegalArgumentException("Could not read csv of dcs for hinted handoff enable. " + dcNames, e); - } - - if (dcNameList.isEmpty()) - throw new IllegalArgumentException("Empty list of Dcs for hinted handoff enable"); - - conf.hinted_handoff_enabled_by_dc.clear(); - conf.hinted_handoff_enabled_by_dc.addAll(dcNameList); + conf.hinted_handoff_enabled = hintedHandoffEnabled; } public static boolean hintedHandoffEnabled() { - return conf.hinted_handoff_enabled_global; + return conf.hinted_handoff_enabled; } - public static Set hintedHandoffEnabledByDC() + public static Set hintedHandoffDisabledDCs() { - return Collections.unmodifiableSet(conf.hinted_handoff_enabled_by_dc); + return conf.hinted_handoff_disabled_datacenters; } - public static boolean shouldHintByDC() + public static void enableHintsForDC(String dc) { - return !conf.hinted_handoff_enabled_by_dc.isEmpty(); + conf.hinted_handoff_disabled_datacenters.remove(dc); } - public static boolean hintedHandoffEnabled(final String dcName) + public static void disableHintsForDC(String dc) { - return conf.hinted_handoff_enabled_by_dc.contains(dcName); + conf.hinted_handoff_disabled_datacenters.add(dc); } public static void setMaxHintWindow(int ms) diff --git a/src/java/org/apache/cassandra/config/ParameterizedClass.java b/src/java/org/apache/cassandra/config/ParameterizedClass.java index 6b7af63cab..c7614de9d3 100644 --- a/src/java/org/apache/cassandra/config/ParameterizedClass.java +++ b/src/java/org/apache/cassandra/config/ParameterizedClass.java @@ -35,10 +35,10 @@ public class ParameterizedClass } @SuppressWarnings("unchecked") - public ParameterizedClass(LinkedHashMap p) + public ParameterizedClass(Map p) { this((String)p.get("class_name"), - p.containsKey("parameters") ? (Map)((List)p.get("parameters")).get(0) : null); + p.containsKey("parameters") ? (Map)((List)p.get("parameters")).get(0) : null); } @Override diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 062f64dee7..d2a50e78d8 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -24,11 +24,15 @@ import java.io.InputStream; import java.io.IOException; import java.net.URL; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import com.google.common.base.Joiner; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.common.io.ByteStreams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +40,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.exceptions.ConfigurationException; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.introspector.MissingProperty; import org.yaml.snakeyaml.introspector.Property; @@ -106,15 +111,11 @@ public class YamlConfigurationLoader implements ConfigurationLoader logConfig(configBytes); - org.yaml.snakeyaml.constructor.Constructor constructor = new org.yaml.snakeyaml.constructor.Constructor(Config.class); - TypeDescription seedDesc = new TypeDescription(ParameterizedClass.class); - seedDesc.putMapPropertyType("parameters", String.class, String.class); - constructor.addTypeDescription(seedDesc); + Constructor constructor = new CustomConstructor(Config.class); MissingPropertiesChecker propertiesChecker = new MissingPropertiesChecker(); constructor.setPropertyUtils(propertiesChecker); Yaml yaml = new Yaml(constructor); Config result = yaml.loadAs(new ByteArrayInputStream(configBytes), Config.class); - result.configHintedHandoff(); propertiesChecker.check(); return result; } @@ -124,6 +125,42 @@ public class YamlConfigurationLoader implements ConfigurationLoader } } + static class CustomConstructor extends Constructor + { + CustomConstructor(Class theRoot) + { + super(theRoot); + + TypeDescription seedDesc = new TypeDescription(ParameterizedClass.class); + seedDesc.putMapPropertyType("parameters", String.class, String.class); + addTypeDescription(seedDesc); + } + + @Override + protected List createDefaultList(int initSize) + { + return Lists.newCopyOnWriteArrayList(); + } + + @Override + protected Map createDefaultMap() + { + return Maps.newConcurrentMap(); + } + + @Override + protected Set createDefaultSet(int initSize) + { + return Sets.newConcurrentHashSet(); + } + + @Override + protected Set createDefaultSet() + { + return Sets.newConcurrentHashSet(); + } + } + private void logConfig(byte[] configBytes) { Map configMap = new TreeMap<>((Map) new Yaml().load(new ByteArrayInputStream(configBytes))); diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 17a9c11976..22831ca299 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -2003,19 +2003,24 @@ public class StorageProxy implements StorageProxyMBean return DatabaseDescriptor.hintedHandoffEnabled(); } - public Set getHintedHandoffEnabledByDC() - { - return DatabaseDescriptor.hintedHandoffEnabledByDC(); - } - public void setHintedHandoffEnabled(boolean b) { DatabaseDescriptor.setHintedHandoffEnabled(b); } - public void setHintedHandoffEnabledByDCList(String dcNames) + public void enableHintsForDC(String dc) { - DatabaseDescriptor.setHintedHandoffEnabled(dcNames); + DatabaseDescriptor.enableHintsForDC(dc); + } + + public void disableHintsForDC(String dc) + { + DatabaseDescriptor.disableHintsForDC(dc); + } + + public Set getHintedHandoffDisabledDCs() + { + return DatabaseDescriptor.hintedHandoffDisabledDCs(); } public int getMaxHintWindow() @@ -2030,27 +2035,29 @@ public class StorageProxy implements StorageProxyMBean public static boolean shouldHint(InetAddress ep) { - if (DatabaseDescriptor.shouldHintByDC()) - { - final String dc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(ep); - //Disable DC specific hints - if(!DatabaseDescriptor.hintedHandoffEnabled(dc)) - { - HintedHandOffManager.instance.metrics.incrPastWindow(ep); - return false; - } - } - else if (!DatabaseDescriptor.hintedHandoffEnabled()) + if (!DatabaseDescriptor.hintedHandoffEnabled()) { HintedHandOffManager.instance.metrics.incrPastWindow(ep); return false; } + Set disabledDCs = DatabaseDescriptor.hintedHandoffDisabledDCs(); + if (!disabledDCs.isEmpty()) + { + final String dc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(ep); + if (disabledDCs.contains(dc)) + { + Tracing.trace("Not hinting {} since its data center {} has been disabled {}", ep, dc, disabledDCs); + HintedHandOffManager.instance.metrics.incrPastWindow(ep); + return false; + } + } + boolean hintWindowExpired = Gossiper.instance.getEndpointDowntime(ep) > DatabaseDescriptor.getMaxHintWindow(); if (hintWindowExpired) { HintedHandOffManager.instance.metrics.incrPastWindow(ep); - Tracing.trace("Not hinting {} which has been down {}ms", ep, Gossiper.instance.getEndpointDowntime(ep)); + Tracing.trace("Not hinting {} which has been down {} ms", ep, Gossiper.instance.getEndpointDowntime(ep)); } return !hintWindowExpired; } diff --git a/src/java/org/apache/cassandra/service/StorageProxyMBean.java b/src/java/org/apache/cassandra/service/StorageProxyMBean.java index e61989281d..0db0ca60ff 100644 --- a/src/java/org/apache/cassandra/service/StorageProxyMBean.java +++ b/src/java/org/apache/cassandra/service/StorageProxyMBean.java @@ -25,9 +25,10 @@ public interface StorageProxyMBean { public long getTotalHints(); public boolean getHintedHandoffEnabled(); - public Set getHintedHandoffEnabledByDC(); public void setHintedHandoffEnabled(boolean b); - public void setHintedHandoffEnabledByDCList(String dcs); + public void enableHintsForDC(String dc); + public void disableHintsForDC(String dc); + public Set getHintedHandoffDisabledDCs(); public int getMaxHintWindow(); public void setMaxHintWindow(int ms); public int getMaxHintsInProgress(); diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index e9a51d147b..929820d271 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -845,9 +845,19 @@ public class NodeProbe implements AutoCloseable return spProxy.getHintedHandoffEnabled(); } - public void enableHintedHandoff(String dcNames) + public void enableHintsForDC(String dc) { - spProxy.setHintedHandoffEnabledByDCList(dcNames); + spProxy.enableHintsForDC(dc); + } + + public void disableHintsForDC(String dc) + { + spProxy.disableHintsForDC(dc); + } + + public Set getHintedHandoffDisabledDCs() + { + return spProxy.getHintedHandoffDisabledDCs(); } public void pauseHintsDelivery() diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index dc3b876490..ed8b2966ae 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -129,7 +129,9 @@ public class NodeTool TpStats.class, TopPartitions.class, SetLoggingLevel.class, - GetLoggingLevels.class + GetLoggingLevels.class, + DisableHintsForDC.class, + EnableHintsForDC.class ); Cli.CliBuilder builder = Cli.builder("nodetool"); diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java b/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java new file mode 100644 index 0000000000..70723182d6 --- /dev/null +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java @@ -0,0 +1,42 @@ +/* + * 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.cassandra.tools.nodetool; + +import java.util.ArrayList; +import java.util.List; + +import io.airlift.command.Arguments; +import io.airlift.command.Command; +import org.apache.cassandra.tools.NodeProbe; +import org.apache.cassandra.tools.NodeTool; + +import static com.google.common.base.Preconditions.checkArgument; + +@Command(name = "disablehintsfordc", description = "Disable hints for a data center") +public class DisableHintsForDC extends NodeTool.NodeToolCmd +{ + @Arguments(usage = "", description = "The data center to disable") + private List args = new ArrayList<>(); + + public void execute(NodeProbe probe) + { + checkArgument(args.size() == 1, "disablehintsfordc requires exactly one data center"); + + probe.disableHintsForDC(args.get(0)); + } +} \ No newline at end of file diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java index d18d77ac5b..149c0fc1ca 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java @@ -17,29 +17,17 @@ */ package org.apache.cassandra.tools.nodetool; -import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; import io.airlift.command.Command; -import java.util.ArrayList; -import java.util.List; - import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; -@Command(name = "enablehandoff", description = "Reenable the future hints storing on the current node") +@Command(name = "enablehandoff", description = "Reenable future hints storing on the current node") public class EnableHandoff extends NodeToolCmd { - @Arguments(usage = ",", description = "Enable hinted handoff only for these DCs") - private List args = new ArrayList<>(); - @Override public void execute(NodeProbe probe) { - checkArgument(args.size() <= 1, "enablehandoff does not accept two args"); - if(args.size() == 1) - probe.enableHintedHandoff(args.get(0)); - else - probe.enableHintedHandoff(); + probe.enableHintedHandoff(); } } \ No newline at end of file diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableHintsForDC.java b/src/java/org/apache/cassandra/tools/nodetool/EnableHintsForDC.java new file mode 100644 index 0000000000..1979ebd37f --- /dev/null +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableHintsForDC.java @@ -0,0 +1,42 @@ +/* + * 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.cassandra.tools.nodetool; + +import java.util.ArrayList; +import java.util.List; + +import io.airlift.command.Arguments; +import io.airlift.command.Command; +import org.apache.cassandra.tools.NodeProbe; +import org.apache.cassandra.tools.NodeTool; + +import static com.google.common.base.Preconditions.checkArgument; + +@Command(name = "enablehintsfordc", description = "Enable hints for a data center that was previsouly disabled") +public class EnableHintsForDC extends NodeTool.NodeToolCmd +{ + @Arguments(usage = "", description = "The data center to enable") + private List args = new ArrayList<>(); + + public void execute(NodeProbe probe) + { + checkArgument(args.size() == 1, "enablehintsfordc requires exactly one data center"); + + probe.enableHintsForDC(args.get(0)); + } +} diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java index 5a00069ba8..65f6729758 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java @@ -28,9 +28,12 @@ public class StatusHandoff extends NodeToolCmd @Override public void execute(NodeProbe probe) { - System.out.println( + System.out.println(String.format("Hinted handoff is %s", probe.isHandoffEnabled() ? "running" - : "not running"); + : "not running")); + + for (String dc : probe.getHintedHandoffDisabledDCs()) + System.out.println(String.format("Data center %s is disabled", dc)); } } \ No newline at end of file diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java index 100a432af1..5887c9a638 100644 --- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java +++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java @@ -132,7 +132,7 @@ public class DatabaseDescriptorTest public Config loadConfig() throws ConfigurationException { Config testConfig = new Config(); - testConfig.cluster_name = "ConfigurationLoader Test";; + testConfig.cluster_name = "ConfigurationLoader Test"; return testConfig; } }