diff --git a/CHANGES.txt b/CHANGES.txt index ea74c6280c..ee98f5d745 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -37,6 +37,7 @@ 2.0.6 + * Allow per-dc enabling of hints (CASSANDRA-6157) * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201) * Fix EstimatedHistogram races (CASSANDRA-6682) * Failure detector correctly converts initial value to nanos (CASSANDRA-6658) diff --git a/build.xml b/build.xml index 1a8de44b8f..7afe3bfe77 100644 --- a/build.xml +++ b/build.xml @@ -389,6 +389,7 @@ + @@ -473,6 +474,7 @@ + diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 2666316d97..41bc038135 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -30,6 +30,9 @@ 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 hinted_handoff_enabled: true # 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 diff --git a/lib/licenses/super-csv-2.1.0.txt b/lib/licenses/super-csv-2.1.0.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/lib/licenses/super-csv-2.1.0.txt @@ -0,0 +1,202 @@ + + 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/lib/super-csv-2.1.0.jar b/lib/super-csv-2.1.0.jar new file mode 100644 index 0000000000..6a85716356 Binary files /dev/null and b/lib/super-csv-2.1.0.jar differ diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index d5108e3aee..ee55c92623 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -17,8 +17,18 @@ */ package org.apache.cassandra.config; +import java.io.IOException; +import java.io.StringReader; +import java.util.List; +import java.util.Set; + +import com.google.common.collect.Sets; +import org.supercsv.io.CsvListReader; +import org.supercsv.prefs.CsvPreference; + import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions; import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions; +import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.util.NativeAllocator; import org.apache.cassandra.utils.FBUtilities; @@ -38,7 +48,9 @@ public class Config public String partitioner; public Boolean auto_bootstrap = true; - public volatile Boolean hinted_handoff_enabled = 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 Integer max_hint_window_in_ms = 3600 * 1000; // one hour public SeedProviderDef seed_provider; @@ -202,6 +214,9 @@ 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(); + public static boolean getOutboundBindAny() { return outboundBindAny; @@ -222,6 +237,38 @@ public class Config isClientMode = clientMode; } + public void configHintedHandoff() throws ConfigurationException + { + if (hinted_handoff_enabled != null && !hinted_handoff_enabled.isEmpty()) + { + if (hinted_handoff_enabled.toLowerCase().equalsIgnoreCase("true")) + { + hinted_handoff_enabled_global = true; + } + else if (hinted_handoff_enabled.toLowerCase().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 + { + 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 73a03eb45c..a8f8d7faff 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -19,6 +19,7 @@ package org.apache.cassandra.config; import java.io.File; import java.io.FileFilter; +import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; @@ -1139,12 +1140,47 @@ public class DatabaseDescriptor public static void setHintedHandoffEnabled(boolean hintedHandoffEnabled) { - conf.hinted_handoff_enabled = 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); } public static boolean hintedHandoffEnabled() { - return conf.hinted_handoff_enabled; + return conf.hinted_handoff_enabled_global; + } + + public static Set hintedHandoffEnabledByDC() + { + return Collections.unmodifiableSet(conf.hinted_handoff_enabled_by_dc); + } + + public static boolean shouldHintByDC() + { + return !conf.hinted_handoff_enabled_by_dc.isEmpty(); + } + + public static boolean hintedHandoffEnabled(final String dcName) + { + return conf.hinted_handoff_enabled_by_dc.contains(dcName); } public static void setMaxHintWindow(int ms) diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index aefc431c84..4a1280c9af 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -99,6 +99,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader constructor.setPropertyUtils(propertiesChecker); Yaml yaml = new Yaml(constructor); Config result = yaml.loadAs(new ByteArrayInputStream(configBytes), Config.class); + result.configHintedHandoff(); propertiesChecker.check(); return result; } diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 05fdd61dd9..5a518380f0 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -1843,11 +1843,21 @@ 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) + { + DatabaseDescriptor.setHintedHandoffEnabled(dcNames); + } + public int getMaxHintWindow() { return DatabaseDescriptor.getMaxHintWindow(); @@ -1860,7 +1870,17 @@ public class StorageProxy implements StorageProxyMBean public static boolean shouldHint(InetAddress ep) { - if (!DatabaseDescriptor.hintedHandoffEnabled()) + 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()) { HintedHandOffManager.instance.metrics.incrPastWindow(ep); return false; diff --git a/src/java/org/apache/cassandra/service/StorageProxyMBean.java b/src/java/org/apache/cassandra/service/StorageProxyMBean.java index 24dd069024..a04b660549 100644 --- a/src/java/org/apache/cassandra/service/StorageProxyMBean.java +++ b/src/java/org/apache/cassandra/service/StorageProxyMBean.java @@ -19,6 +19,7 @@ package org.apache.cassandra.service; import java.util.List; import java.util.Map; +import java.util.Set; public interface StorageProxyMBean { @@ -72,7 +73,9 @@ public interface StorageProxyMBean public long getTotalHints(); public boolean getHintedHandoffEnabled(); + public Set getHintedHandoffEnabledByDC(); public void setHintedHandoffEnabled(boolean b); + public void setHintedHandoffEnabledByDCList(String dcs); 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 4df3ae2edf..78da62ab69 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -745,6 +745,11 @@ public class NodeProbe implements AutoCloseable spProxy.setHintedHandoffEnabled(true); } + public void enableHintedHandoff(String dcNames) + { + spProxy.setHintedHandoffEnabledByDCList(dcNames); + } + public void pauseHintsDelivery() { hhProxy.pauseHintsDelivery(true); diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index 94bce74b67..453491b47f 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -1220,10 +1220,17 @@ public class NodeTool @Command(name = "enablehandoff", description = "Reenable the future hints storing on the current node") public static 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) { - probe.enableHintedHandoff(); + checkArgument(args.size() <= 1, "enablehandoff does not accept two args"); + if(args.size() == 1) + probe.enableHintedHandoff(args.get(0)); + else + probe.enableHintedHandoff(); } }