Merge branch 'cassandra-3.0' into cassandra-3.9
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 62914a2..9d31b60 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1337,15 +1337,24 @@
{
long start = System.nanoTime();
- Memtable mt = data.getMemtableFor(opGroup, commitLogPosition);
- long timeDelta = mt.put(update, indexer, opGroup);
- DecoratedKey key = update.partitionKey();
- invalidateCachedPartition(key);
- metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
- StorageHook.instance.reportWrite(metadata.cfId, update);
- metric.writeLatency.addNano(System.nanoTime() - start);
- if(timeDelta < Long.MAX_VALUE)
- metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ try
+ {
+ Memtable mt = data.getMemtableFor(opGroup, commitLogPosition);
+ long timeDelta = mt.put(update, indexer, opGroup);
+ DecoratedKey key = update.partitionKey();
+ invalidateCachedPartition(key);
+ metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
+ StorageHook.instance.reportWrite(metadata.cfId, update);
+ metric.writeLatency.addNano(System.nanoTime() - start);
+ if(timeDelta < Long.MAX_VALUE)
+ metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ }
+ catch (RuntimeException e)
+ {
+ throw new RuntimeException(e.getMessage()
+ + " for ks: "
+ + keyspace.getName() + ", table: " + name, e);
+ }
}
/**
