cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 11 Dec 2015 22:56:18 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ff7c9ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ff7c9ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ff7c9ce

Branch: refs/heads/trunk
Commit: 6ff7c9ce98eb937c6e2347df9af1d36364eeb184
Parents: 94c361d dff2214
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Dec 11 16:51:04 2015 -0600
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Dec 11 16:51:04 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ff7c9ce/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 035e471,96f2f4f..d44a47b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,11 +1,34 @@@
 -2.1.13
 +2.2.5
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
   * Allow cancellation of index summary redistribution (CASSANDRA-8805)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
   * Fix Stress profile parsing on Windows (CASSANDRA-10808)
  
 -
 -2.1.12
 +2.2.4
 + * Show CQL help in cqlsh in web browser (CASSANDRA-7225)
 + * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
 + * Reject index queries while the index is building (CASSANDRA-8505)
 + * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC
(CASSANDRA-10747)
 + * Fix JSON update with prepared statements (CASSANDRA-10631)
 + * Don't do anticompaction after subrange repair (CASSANDRA-10422)
 + * Fix SimpleDateType type compatibility (CASSANDRA-10027)
 + * (Hadoop) fix splits calculation (CASSANDRA-10640)
 + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 + * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592)
 +Merged from 2.1:
   * Fix incremental repair hang when replica is down (CASSANDRA-10288)
   * Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791)
   * Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ff7c9ce/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index eb05324,a27fa20..6f38545
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -377,29 -467,6 +377,31 @@@ public class CassandraDaemo
          return setupCompleted;
      }
  
 +    private void logSystemInfo()
 +    {
 +    	if (logger.isInfoEnabled())
 +    	{
 +	        try
 +	        {
 +	            logger.info("Hostname: {}", InetAddress.getLocalHost().getHostName());
 +	        }
 +	        catch (UnknownHostException e1)
 +	        {
 +	            logger.info("Could not resolve local host");
 +	        }
 +
 +	        logger.info("JVM vendor/version: {}/{}", System.getProperty("java.vm.name"), System.getProperty("java.version"));
 +	        logger.info("Heap size: {}/{}", Runtime.getRuntime().totalMemory(), Runtime.getRuntime().maxMemory());
 +
 +	        for(MemoryPoolMXBean pool: ManagementFactory.getMemoryPoolMXBeans())
 +	            logger.info("{} {}: {}", pool.getName(), pool.getType(), pool.getPeakUsage());
 +
 +	        logger.info("Classpath: {}", System.getProperty("java.class.path"));
++
++            logger.info("JVM Arguments: {}", ManagementFactory.getRuntimeMXBean().getInputArguments());
 +    	}
 +    }
 +
      /**
       * Initialize the Cassandra Daemon based on the given <a
       * href="http://commons.apache.org/daemon/jsvc.html">Commons


Mime
View raw message