Skip to content
Permalink
Browse files
Merge branch 'cassandra-4.1' into trunk
  • Loading branch information
ekaterinadimitrova2 committed May 11, 2022
2 parents 9e49a2b + f57c8d2 commit e0247d6833f59901e6849e168f6e2363351c6f4c
Showing 6 changed files with 44 additions and 89 deletions.
@@ -2,6 +2,7 @@
* Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations (CASSANDRA-17495)
* Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
Merged from 4.1:
* Fix repair_request_timeout_in_ms and remove paxos_auto_repair_threshold_mb (CASSANDRA-17557)
* Incremental repair leaks SomeRepairFailedException after switch away from flatMap (CASSANDRA-17620)
* StorageService read threshold get methods throw NullPointerException due to not handling null configs (CASSANDRA-17593)
Merged from 4.0:
@@ -145,7 +145,7 @@ public static Set<String> splitCommaDelimited(String src)
@Replaces(oldName = "truncate_request_timeout_in_ms", converter = Converters.MILLIS_DURATION_LONG, deprecated = true)
public volatile SmallestDurationMilliseconds truncate_request_timeout = new SmallestDurationMilliseconds("60000ms");

public volatile Long repair_request_timeout_in_ms = 120000L;
public volatile SmallestDurationMilliseconds repair_request_timeout = new SmallestDurationMilliseconds("120000ms");

public Integer streaming_connections_per_host = 1;
@Replaces(oldName = "streaming_keep_alive_period_in_secs", converter = Converters.SECONDS_DURATION, deprecated = true)
@@ -1027,12 +1027,6 @@ public static PaxosStatePurging fromBoolean(boolean enabled)
*/
public String paxos_contention_min_delta;

/**
* The amount of disk space paxos uncommitted key files can consume before we begin automatically scheduling paxos repairs.
* Note that these repairs are uncoordinated and so do not contribute to expunging system.paxos records.
*/
public volatile int paxos_auto_repair_threshold_mb = 32;

/**
* The number of keys we may simultaneously attempt to finish incomplete paxos operations for.
*/
@@ -774,12 +774,6 @@ else if (conf.repair_session_space.toMebibytes() > (int) (Runtime.getRuntime().m
+ conf.paxos_cache_size + "', supported values are <integer> >= 0.", false);
}

if (conf.paxos_auto_repair_threshold_mb < 0)
{
throw new ConfigurationException("paxos_auto_repair_threshold_mb option was set incorrectly to '"
+ conf.paxos_auto_repair_threshold_mb + "', supported values are <integer> >= 0.", false);
}

// if set to empty/"auto" then use 5% of Heap size
indexSummaryCapacityInMiB = (conf.index_summary_capacity == null)
? Math.max(1, (int) (Runtime.getRuntime().totalMemory() * 0.05 / 1024 / 1024))
@@ -1844,14 +1838,14 @@ public static void setTruncateRpcTimeout(long timeOutInMillis)
conf.truncate_request_timeout = SmallestDurationMilliseconds.inMilliseconds(timeOutInMillis);
}

public static long getRepairRpcTimeout()
public static long getRepairRpcTimeout(TimeUnit unit)
{
return conf.repair_request_timeout_in_ms;
return conf.repair_request_timeout.to(unit);
}

public static void setRepairRpcTimeout(Long timeOutInMillis)
{
conf.repair_request_timeout_in_ms = timeOutInMillis;
conf.repair_request_timeout = SmallestDurationMilliseconds.inMilliseconds(timeOutInMillis);
}

public static boolean hasCrossNodeTimeout()
@@ -2670,16 +2664,6 @@ public static boolean paxoTopologyRepairStrictEachQuorum()
return conf.paxos_topology_repair_strict_each_quorum;
}

public static int getPaxosAutoRepairThresholdMB()
{
return conf.paxos_auto_repair_threshold_mb;
}

public static void setPaxosAutoRepairThresholdMB(int threshold)
{
conf.paxos_auto_repair_threshold_mb = threshold;
}

public static void setNativeTransportMaxRequestDataInFlightPerIpInBytes(long maxRequestDataInFlightInBytes)
{
if (maxRequestDataInFlightInBytes == -1)

0 comments on commit e0247d6

Please sign in to comment.