This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e107b855718efc76f19dc9c438fb032c423f4ed0 Merge: 86604f5038 5c4c7b69aa Author: Jon Meredith <[email protected]> AuthorDate: Mon Feb 13 17:49:39 2023 -0700 Merge branch 'cassandra-4.1' into trunk ide/idea/workspace.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --cc ide/idea/workspace.xml index b3ec20bbe1,f30a44ade3..0b9bd47cec --- a/ide/idea/workspace.xml +++ b/ide/idea/workspace.xml @@@ -143,7 -143,15 +143,16 @@@ <configuration default="true" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" value="" /> - <option name="VM_PARAMETERS" value="-Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml -Dcassandra.storagedir=$PROJECT_DIR$/data -Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml -Dcassandra.logdir=$PROJECT_DIR$/data/logs -Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -DQT_SHRINKS=0 -ea -Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true -XX:HeapDumpPath=build/test" /> + <option name="VM_PARAMETERS" value=" + -DQT_SHRINKS=0 + -Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml + -Dcassandra.logdir=$PROJECT_DIR$/data/logs + -Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true + -Dcassandra.storagedir=$PROJECT_DIR$/data + -Djava.library.path=$PROJECT_DIR$/lib/sigar-bin + -Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml ++ -XX:HeapDumpPath=build/test + -ea" /> <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@@ -173,7 -181,26 +182,27 @@@ <option name="MAIN_CLASS_NAME" value="" /> <option name="METHOD_NAME" value="" /> <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-Dcassandra.config=file://$PROJECT_DIR$/test/conf/cassandra.yaml -Dlogback.configurationFile=file://$PROJECT_DIR$/test/conf/logback-test.xml -Dcassandra.logdir=$PROJECT_DIR$/build/test/logs -Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -Dlegacy-sstable-root=$PROJECT_DIR$/test/data/legacy-sstables -Dinvalid-legacy-sstable-root=$PROJECT_DIR$/test/data/invalid-legacy-sstables -Dcassandra.ring_delay_ms=1000 -Dcassandra.skip_sync=true -ea -XX:MaxMe [...] + <option name="VM_PARAMETERS" value=" + -Dcassandra.config=file://$PROJECT_DIR$/test/conf/cassandra.yaml + -Dcassandra.logdir=$PROJECT_DIR$/build/test/logs + -Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true + -Dcassandra.ring_delay_ms=1000 + -Dcassandra.skip_sync=true + -Dcassandra.strict.runtime.checks=true + -Dcassandra.test.flush_local_schema_changes=false + -Dcassandra.test.messagingService.nonGracefulShutdown=true + -Dcassandra.tolerate_sstable_size=true + -Dcassandra.use_nix_recursive_delete=true + -Dinvalid-legacy-sstable-root=$PROJECT_DIR$/test/data/invalid-legacy-sstables + -Djava.library.path=$PROJECT_DIR$/lib/sigar-bin + -Dlegacy-sstable-root=$PROJECT_DIR$/test/data/legacy-sstables + -Dlogback.configurationFile=file://$PROJECT_DIR$/test/conf/logback-test.xml + -Dmigration-sstable-root=$PROJECT_DIR$/test/data/migration-sstables + -XX:ActiveProcessorCount=2 - -XX:MaxMetaspaceSize=384M ++ -XX:HeapDumpPath=build/test ++ -XX:MaxMetaspaceSize=1G + -XX:SoftRefLRUPolicyMSPerMB=0 + -ea" /> <option name="PARAMETERS" value="" /> <fork_mode value="class" /> <option name="WORKING_DIRECTORY" value="" /> @@@ -193,7 -220,17 +222,19 @@@ <configuration default="false" name="Cassandra" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" value="org.apache.cassandra.service.CassandraDaemon" /> - <option name="VM_PARAMETERS" value="-Dcassandra-foreground=yes -Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml -Dcassandra.storagedir=$PROJECT_DIR$/data -Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml -Dcassandra.logdir=$PROJECT_DIR$/data/logs -Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -Dcassandra.jmx.local.port=7199 -ea -Xmx1G -Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true -XX:HeapDumpPath=build/test" /> + <option name="VM_PARAMETERS" value=" + -Dcassandra-foreground=yes + -Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml + -Dcassandra.jmx.local.port=7199 + -Dcassandra.logdir=$PROJECT_DIR$/data/logs + -Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true ++ -Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true + -Dcassandra.storagedir=$PROJECT_DIR$/data + -Djava.library.path=$PROJECT_DIR$/lib/sigar-bin + -Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml ++ -XX:HeapDumpPath=build/test + -Xmx1G + -ea" /> <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
