Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageProxy.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1daf1916
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1daf1916
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1daf1916
Branch: refs/heads/trunk
Commit: 1daf191650dea12297e38734572d040b0ebc85e1
Parents: ab31b21 0e18f23
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Sep 13 11:51:28 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Sep 13 11:51:28 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/metrics/StorageMetrics.java | 3 +++
.../apache/cassandra/service/CassandraDaemon.java | 5 ++---
.../org/apache/cassandra/service/StorageProxy.java | 17 ++++++++---------
.../apache/cassandra/service/StorageService.java | 3 ++-
.../cassandra/service/StorageServiceMBean.java | 1 +
6 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daf1916/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c7aa165,ad32460..9e3c25a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,54 -18,14 +37,55 @@@ Merged from 1.2
* Replace the deprecated MapMaker with CacheLoader (CASSANDRA-6007)
* Add SSTableDeletingNotification to DataTracker (CASSANDRA-6010)
* Fix snapshots in use get deleted during snapshot repair (CASSANDRA-6011)
+ * Move hints and exception count to o.a.c.metrics (CASSANDRA-6017)
-1.2.9
+2.0.0
+ * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138)
+ * Fix periodic memtable flushing behavior with clean memtables
(CASSANDRA-5931)
+ * Fix dateOf() function for pre-2.0 timestamp columns (CASSANDRA-5928)
+ * Fix SSTable unintentionally loads BF when opened for batch (CASSANDRA-5938)
+ * Add stream session progress to JMX (CASSANDRA-4757)
+ * Fix NPE during CAS operation (CASSANDRA-5925)
+Merged from 1.2:
* Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900)
- * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
- (CASSANDRA-5800)
- * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
+ * Don't announce schema version until we've loaded the changes locally
+ (CASSANDRA-5904)
+ * Fix to support off heap bloom filters size greater than 2 GB
(CASSANDRA-5903)
+ * Properly handle parsing huge map and set literals (CASSANDRA-5893)
+
+
+2.0.0-rc2
+ * enable vnodes by default (CASSANDRA-5869)
+ * fix CAS contention timeout (CASSANDRA-5830)
+ * fix HsHa to respect max frame size (CASSANDRA-4573)
+ * Fix (some) 2i on composite components omissions (CASSANDRA-5851)
+ * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880)
+Merged from 1.2:
+ * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
+ * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
+ * cqlsh: add support for multiline comments (CASSANDRA-5798)
+ * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
+ (CASSANDRA-5856)
+
+
+2.0.0-rc1
+ * improve DecimalSerializer performance (CASSANDRA-5837)
+ * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
+ * fix schema-related trigger issues (CASSANDRA-5774)
+ * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
+ * Fix assertion error during repair (CASSANDRA-5801)
+ * Fix range tombstone bug (CASSANDRA-5805)
+ * DC-local CAS (CASSANDRA-5797)
+ * Add a native_protocol_version column to the system.local table
(CASSANRDA-5819)
+ * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
+ * Fix buffer underflow on socket close (CASSANDRA-5792)
+Merged from 1.2:
+ * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
+ * cqlsh: add collections support to COPY (CASSANDRA-5698)
+ * retry important messages for any IOException (CASSANDRA-5804)
+ * Allow empty IN relations in SELECT/UPDATE/DELETE statements
(CASSANDRA-5626)
+ * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
* fix bulk-loading compressed sstables (CASSANDRA-5820)
* (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter
(CASSANDRA-5824)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daf1916/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 20c70e7,b2fc367..2879f1d
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -44,10 -43,9 +44,11 @@@ import org.apache.cassandra.config.Sche
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.commitlog.CommitLog;
import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.db.compaction.LegacyLeveledManifest;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.FSError;
import org.apache.cassandra.io.util.FileUtils;
+ import org.apache.cassandra.metrics.StorageMetrics;
import org.apache.cassandra.thrift.ThriftServer;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.CLibrary;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daf1916/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 83cb265,be92213..aa50d02
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -60,11 -61,12 +60,12 @@@ import org.apache.cassandra.locator.IEn
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.metrics.ClientRequestMetrics;
import org.apache.cassandra.metrics.ReadRepairMetrics;
+ import org.apache.cassandra.metrics.StorageMetrics;
import org.apache.cassandra.net.*;
+import org.apache.cassandra.service.paxos.*;
import org.apache.cassandra.tracing.Tracing;
-import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.triggers.TriggerExecutor;
+import org.apache.cassandra.utils.*;
public class StorageProxy implements StorageProxyMBean
{
@@@ -928,12 -591,29 +927,12 @@@
{
assert ttl > 0;
UUID hostId =
StorageService.instance.getTokenMetadata().getHostId(target);
- if ((hostId == null) &&
(MessagingService.instance().getVersion(target) < MessagingService.VERSION_12))
- {
- logger.warn("Unable to store hint for host with missing ID, {}
(old node?)", target.toString());
- return;
- }
assert hostId != null : "Missing host ID for " +
target.getHostAddress();
- mutation.toHint(ttl, hostId).apply();
+ HintedHandOffManager.instance.hintFor(mutation, ttl, hostId).apply();
- totalHints.incrementAndGet();
+ StorageMetrics.totalHints.inc();
}
- private static void sendMessagesToOneDC(MessageOut message,
Collection<InetAddress> targets, boolean localDC, AbstractWriteResponseHandler
handler)
- {
- try
- {
- sendMessagesToOneDCInternal(message, targets, localDC, handler);
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- }
-
- private static void sendMessagesToOneDCInternal(MessageOut message,
Collection<InetAddress> targets, boolean localDC, AbstractWriteResponseHandler
handler) throws IOException
+ private static void sendMessagesToNonlocalDC(MessageOut message,
Collection<InetAddress> targets, AbstractWriteResponseHandler handler)
{
Iterator<InetAddress> iter = targets.iterator();
InetAddress target = iter.next();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daf1916/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 6dbad93,7a5bbbc..32b80fc
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -68,7 -64,8 +68,8 @@@ import org.apache.cassandra.io.sstable.
import org.apache.cassandra.io.sstable.SSTableLoader;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.locator.*;
+ import org.apache.cassandra.metrics.StorageMetrics;
-import org.apache.cassandra.net.IAsyncResult;
+import org.apache.cassandra.net.AsyncOneResponse;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.net.ResponseVerbHandler;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daf1916/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
