You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/11/06 21:32:36 UTC
[1/3] cassandra git commit: Improve PropertyFileSnitch log formatting
Repository: cassandra
Updated Branches:
refs/heads/trunk b4cbb28f3 -> a67980e8e
Improve PropertyFileSnitch log formatting
Patch by Liang Xie; reviewed by Tyler Hobbs for CASSANDRA-8183
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b3f3e96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b3f3e96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b3f3e96
Branch: refs/heads/trunk
Commit: 6b3f3e9607c6e1113dd1e475b5b7c3ad91de6c03
Parents: 65f7990
Author: Liang Xie <li...@apache.org>
Authored: Thu Nov 6 13:37:03 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Nov 6 13:37:03 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/locator/PropertyFileSnitch.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b3f3e96/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a469bbf..8a7697b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Improve PropertyFileSnitch logging (CASSANDRA-8183)
* Abort liveRatio calculation if the memtable is flushed (CASSANDRA-8164)
* Correctly handle non-text column names in cql3 (CASSANDRA-8178)
* Fix deletion for indexes on primary key columns (CASSANDRA-8206)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b3f3e96/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
index 9138bc2..4f822c6 100644
--- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.locator;
import java.io.InputStream;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -33,6 +34,7 @@ import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.ResourceWatcher;
import org.apache.cassandra.utils.WrappedRunnable;
+import org.apache.commons.lang3.StringUtils;
/**
* Used to determine if two IP's are in the same datacenter or on the same rack.
@@ -185,7 +187,14 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch
throw new ConfigurationException(String.format("Snitch definitions at %s do not define a location for this node's broadcast address %s, nor does it provides a default",
SNITCH_PROPERTIES_FILENAME, FBUtilities.getBroadcastAddress()));
- logger.debug("loaded network topology {}", FBUtilities.toString(reloadedMap));
+ if (logger.isDebugEnabled())
+ {
+ StringBuilder sb = new StringBuilder();
+ for (Map.Entry<InetAddress, String[]> entry : reloadedMap.entrySet())
+ sb.append(entry.getKey()).append(":").append(Arrays.toString(entry.getValue())).append(", ");
+ logger.debug("Loaded network topology from property file: {}", StringUtils.removeEnd(sb.toString(), ", "));
+ }
+
endpointMap = reloadedMap;
if (StorageService.instance != null) // null check tolerates circular dependency; see CASSANDRA-4145
StorageService.instance.getTokenMetadata().invalidateCachedRings();
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a67980e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a67980e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a67980e8
Branch: refs/heads/trunk
Commit: a67980e8ee8a6bc72bb78044ee2a1b20a3121a2a
Parents: b4cbb28 ffe69c3
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Nov 6 14:32:23 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Nov 6 14:32:23 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/cassandra/locator/PropertyFileSnitch.java | 11 ++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a67980e8/CHANGES.txt
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffe69c3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffe69c3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffe69c3d
Branch: refs/heads/trunk
Commit: ffe69c3d7dd3b529c90bdd30356d991998289284
Parents: 9685622 6b3f3e9
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Nov 6 14:31:55 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Nov 6 14:31:55 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/cassandra/locator/PropertyFileSnitch.java | 11 ++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffe69c3d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 89db48e,8a7697b..c1cc083
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,6 +1,35 @@@
-2.0.12:
+2.1.3
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
++Merged from 2.0:
+ * Improve PropertyFileSnitch logging (CASSANDRA-8183)
- * Abort liveRatio calculation if the memtable is flushed (CASSANDRA-8164)
+
+2.1.2
+ * (cqlsh) parse_for_table_meta errors out on queries with undefined
+ grammars (CASSANDRA-8262)
+ * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
+ * Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
+ * Optimize partitioner tokens (CASSANDRA-8230)
+ * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)
+ * Make cache serializers pluggable (CASSANDRA-8096)
+ * Fix issues with CONTAINS (KEY) queries on secondary indexes
+ (CASSANDRA-8147)
+ * Fix read-rate tracking of sstables for some queries (CASSANDRA-8239)
+ * Fix default timestamp in QueryOptions (CASSANDRA-8246)
+ * Set socket timeout when reading remote version (CASSANDRA-8188)
+ * Refactor how we track live size (CASSANDRA-7852)
+ * Make sure unfinished compaction files are removed (CASSANDRA-8124)
+ * Fix shutdown when run as Windows service (CASSANDRA-8136)
+ * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031)
+ * Fix race in RecoveryManagerTest (CASSANDRA-8176)
+ * Avoid IllegalArgumentException while sorting sstables in
+ IndexSummaryManager (CASSANDRA-8182)
+ * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579)
+ * Add 'die' policy for commit log and disk failure (CASSANDRA-7927)
+ * Fix installing as service on Windows (CASSANDRA-8115)
+ * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
+ * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
+Merged from 2.0:
* Correctly handle non-text column names in cql3 (CASSANDRA-8178)
* Fix deletion for indexes on primary key columns (CASSANDRA-8206)
* Add 'nodetool statusgossip' (CASSANDRA-8125)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffe69c3d/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
----------------------------------------------------------------------