You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2019/01/21 17:45:42 UTC

[cassandra] branch cassandra-3.0 updated (f61b926 -> 459945b)

This is an automated email from the ASF dual-hosted git repository.

benedict pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from f61b926  Merge branch 'cassandra-2.2' into cassandra-3.0
     add 1d5e030  Introduce in-jvm distributed tests
     add a3004ef  Make sure that SEP Worker shuts down when pool is shutdown
     add 8ad4a9a  In JVM dtests need to clean up after instance shutdown
     add fdb1735  In JVM dtests need to clean up after instance shutdown
     add 459945b  Merge branch 'cassandra-2.2' into cassandra-3.0

No new revisions were added by this update.

Summary of changes:
 .circleci/config.yml                               |  14 +-
 build.xml                                          |  19 +-
 ide/idea-iml-file.xml                              |   1 +
 ide/idea/workspace.xml                             |   4 +-
 .../apache/cassandra/auth/PermissionsCache.java    |  14 +-
 src/java/org/apache/cassandra/auth/RolesCache.java |  11 +-
 .../apache/cassandra/batchlog/BatchlogManager.java |  44 +-
 .../cassandra/concurrent/InfiniteLoopExecutor.java |  83 +++
 .../concurrent/JMXEnabledThreadPoolExecutor.java   |  24 +-
 .../org/apache/cassandra/concurrent/SEPWorker.java |  17 +-
 .../cassandra/concurrent/ScheduledExecutors.java   |  15 +
 .../cassandra/concurrent/SharedExecutorPool.java   |  34 +-
 .../apache/cassandra/concurrent/StageManager.java  |  10 +
 src/java/org/apache/cassandra/config/Config.java   |  12 +
 .../cassandra/config/DatabaseDescriptor.java       |   6 +-
 .../org/apache/cassandra/cql3/QueryOptions.java    |   7 +-
 .../org/apache/cassandra/cql3/QueryProcessor.java  |   8 +-
 .../cassandra/db/BlacklistedDirectories.java       |  17 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |  23 +-
 .../apache/cassandra/db/HintedHandOffManager.java  |  15 +-
 src/java/org/apache/cassandra/db/Memtable.java     |   3 +-
 .../apache/cassandra/db/MutationVerbHandler.java   |   1 -
 .../apache/cassandra/db/commitlog/CommitLog.java   |  15 +-
 .../cassandra/db/compaction/CompactionManager.java |  22 +-
 .../org/apache/cassandra/gms/FailureDetector.java  |  14 +-
 src/java/org/apache/cassandra/gms/Gossiper.java    |  15 +-
 .../apache/cassandra/hints/HintsBufferPool.java    |  10 +-
 .../org/apache/cassandra/hints/HintsService.java   |  16 +-
 .../cassandra/index/SecondaryIndexManager.java     |  12 +-
 .../cassandra/io/sstable/IndexSummaryManager.java  |  31 +-
 .../cassandra/io/sstable/format/SSTableReader.java |   7 +
 .../apache/cassandra/io/util/DataInputBuffer.java  |   8 +-
 .../cassandra/locator/DynamicEndpointSnitch.java   |  24 +-
 .../cassandra/locator/EndpointSnitchInfo.java      |  14 +-
 .../cassandra/locator/InetAddressAndPort.java      | 194 ++++++
 .../metrics/CassandraMetricsRegistry.java          |  15 +-
 .../org/apache/cassandra/net/MessagingService.java |  14 +-
 .../org/apache/cassandra/service/CacheService.java |  16 +-
 .../apache/cassandra/service/CassandraDaemon.java  |  11 +-
 .../service/PendingRangeCalculatorService.java     |   9 +
 .../org/apache/cassandra/service/StorageProxy.java |  14 +-
 .../apache/cassandra/service/StorageService.java   |  21 +-
 .../cassandra/utils/BackgroundActivityMonitor.java |  12 +
 .../org/apache/cassandra/utils/ByteBufferUtil.java |  31 +
 .../org/apache/cassandra/utils/FBUtilities.java    |  26 +-
 .../org/apache/cassandra/utils/MBeanWrapper.java   | 179 +++++
 src/java/org/apache/cassandra/utils/Mx4jTool.java  |   4 +-
 .../cassandra/utils/NativeLibraryDarwin.java       |   4 +-
 .../apache/cassandra/utils/NativeLibraryLinux.java |   4 +-
 .../cassandra/utils/NativeLibraryWindows.java      |   4 +-
 .../org/apache/cassandra/utils/concurrent/Ref.java |  40 +-
 .../apache/cassandra/utils/memory/BufferPool.java  |  43 +-
 .../utils/memory/MemtableCleanerThread.java        |  77 ++-
 .../cassandra/utils/memory/MemtablePool.java       |  11 +
 .../progress/jmx/LegacyJMXProgressSupport.java     |   4 +-
 test/conf/{logback-test.xml => logback-dtest.xml}  |  56 +-
 test/conf/logback-test.xml                         |   2 +-
 .../apache/cassandra/distributed/Coordinator.java  |  78 +++
 .../distributed/DistributedReadWritePathTest.java  | 151 ++++
 .../cassandra/distributed/DistributedTestBase.java |  86 +++
 .../org/apache/cassandra/distributed/Instance.java | 413 +++++++++++
 .../cassandra/distributed/InstanceClassLoader.java | 109 +++
 .../cassandra/distributed/InstanceConfig.java      |  87 +++
 .../cassandra/distributed/InstanceIDDefiner.java   |  21 +-
 .../cassandra/distributed/InvokableInstance.java   | 213 ++++++
 .../cassandra/distributed/LegacyAdapter.java       |  25 +-
 .../org/apache/cassandra/distributed/Message.java  |  40 +-
 .../cassandra/distributed/MessageFilters.java      | 175 +++++
 .../org/apache/cassandra/distributed/RowUtil.java} |  37 +-
 .../apache/cassandra/distributed/TestCluster.java  | 280 ++++++++
 .../apache/cassandra/LogbackStatusListener.java    | 770 ++++++++++++---------
 .../cassandra/concurrent/SEPExecutorTest.java      |  70 ++
 72 files changed, 3099 insertions(+), 817 deletions(-)
 create mode 100644 src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java
 create mode 100644 src/java/org/apache/cassandra/locator/InetAddressAndPort.java
 create mode 100644 src/java/org/apache/cassandra/utils/MBeanWrapper.java
 copy test/conf/{logback-test.xml => logback-dtest.xml} (57%)
 create mode 100644 test/distributed/org/apache/cassandra/distributed/Coordinator.java
 create mode 100644 test/distributed/org/apache/cassandra/distributed/DistributedReadWritePathTest.java
 create mode 100644 test/distributed/org/apache/cassandra/distributed/DistributedTestBase.java
 create mode 100644 test/distributed/org/apache/cassandra/distributed/Instance.java
 create mode 100644 test/distributed/org/apache/cassandra/distributed/InstanceClassLoader.java
 create mode 100644 test/distributed/org/apache/cassandra/distributed/InstanceConfig.java
 copy src/java/org/apache/cassandra/gms/VersionGenerator.java => test/distributed/org/apache/cassandra/distributed/InstanceIDDefiner.java (64%)
 create mode 100644 test/distributed/org/apache/cassandra/distributed/InvokableInstance.java
 copy src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java => test/distributed/org/apache/cassandra/distributed/LegacyAdapter.java (59%)
 copy src/java/org/apache/cassandra/cql3/IndexName.java => test/distributed/org/apache/cassandra/distributed/Message.java (58%)
 create mode 100644 test/distributed/org/apache/cassandra/distributed/MessageFilters.java
 copy test/{unit/org/apache/cassandra/cql3/validation/entities/udfverify/UseOfSynchronizedWithWait.java => distributed/org/apache/cassandra/distributed/RowUtil.java} (54%)
 create mode 100644 test/distributed/org/apache/cassandra/distributed/TestCluster.java
 create mode 100644 test/unit/org/apache/cassandra/concurrent/SEPExecutorTest.java


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org