You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/04 22:26:30 UTC
[3/6] git commit: Remove blocking flushes in gossip thread patch by
jbellis; reviewed by brandonwilliams for CASSANDRA-6297
Remove blocking flushes in gossip thread
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6297
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d58c5ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d58c5ae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d58c5ae
Branch: refs/heads/trunk
Commit: 3d58c5ae183b4a4bd0dbf099849ded894e2f53a5
Parents: c3c8a24
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 4 15:15:40 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 4 15:16:31 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemTable.java | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d58c5ae/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index de416e2..fd3af68 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@
* restrict max_num_tokens to 1536 (CASSANDRA-6267)
* Nodetool gets default JMX port from cassandra-env.sh (CASSANDRA-6273)
* make calculatePendingRanges asynchronous (CASSANDRA-6244)
+ * Remove blocking flushes in gossip thread (CASSANDRA-6297)
1.2.11
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d58c5ae/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index 432a434..fbd765f 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -315,7 +315,6 @@ public class SystemTable
String req = "INSERT INTO system.%s (peer, tokens) VALUES ('%s', %s)";
processInternal(String.format(req, PEERS_CF, ep.getHostAddress(), tokensAsSet(tokens)));
- forceBlockingFlush(PEERS_CF);
}
public static synchronized void updatePeerInfo(InetAddress ep, String columnName, String value)
@@ -372,7 +371,6 @@ public class SystemTable
{
String req = "DELETE FROM system.%s WHERE peer = '%s'";
processInternal(String.format(req, PEERS_CF, ep.getHostAddress()));
- forceBlockingFlush(PEERS_CF);
}
/**
@@ -623,7 +621,6 @@ public class SystemTable
RowMutation rm = new RowMutation(Table.SYSTEM_KS, ByteBufferUtil.bytes(table));
rm.add(cf);
rm.apply();
- forceBlockingFlush(INDEX_CF);
}
public static void setIndexRemoved(String table, String indexName)
@@ -631,7 +628,6 @@ public class SystemTable
RowMutation rm = new RowMutation(Table.SYSTEM_KS, ByteBufferUtil.bytes(table));
rm.delete(new QueryPath(INDEX_CF, null, ByteBufferUtil.bytes(indexName)), FBUtilities.timestampMicros());
rm.apply();
- forceBlockingFlush(INDEX_CF);
}
/**