rename rpc_timeout settings to request_timeout patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5027
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a96ec70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a96ec70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a96ec70 Branch: refs/heads/cassandra-1.2.0 Commit: 8a96ec702168430eea7400d41fc476b93c7e7404 Parents: aaf9409 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 4 21:44:55 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 4 21:45:15 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 4 +++ conf/cassandra.yaml | 15 +++++------ src/java/org/apache/cassandra/config/Config.java | 10 +++--- .../cassandra/config/DatabaseDescriptor.java | 20 +++++++------- .../org/apache/cassandra/net/MessagingService.java | 2 +- 5 files changed, 27 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a96ec70/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 70e465c..a08e78a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +1.2-rc1 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027) + + 1.2-beta3 * make consistency level configurable in cqlsh (CASSANDRA-4829) * fix cqlsh rendering of blob fields (CASSANDRA-4970) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a96ec70/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 9594672..f2be64a 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -449,18 +449,17 @@ compaction_preheat_key_cache: true # stream_throughput_outbound_megabits_per_sec: 400 # How long the coordinator should wait for read operations to complete -read_rpc_timeout_in_ms: 10000 +read_request_timeout_in_ms: 10000 # How long the coordinator should wait for seq or index scans to complete -range_rpc_timeout_in_ms: 10000 +range_request_timeout_in_ms: 10000 # How long the coordinator should wait for writes to complete -write_rpc_timeout_in_ms: 10000 +write_request_timeout_in_ms: 10000 # How long the coordinator should wait for truncates to complete -# (This can be much longer, because we need to flush all CFs -# to make sure we can clear out anythink in the commitlog that could -# cause truncated data to reappear.) -truncate_rpc_timeout_in_ms: 300000 +# (This can be much longer, because unless auto_snapshot is disabled +# we need to flush first so we can snapshot before removing the data.) +truncate_request_timeout_in_ms: 60000 # The default timeout for other, miscellaneous operations -rpc_timeout_in_ms: 10000 +request_timeout_in_ms: 10000 # Enable operation timeout information exchange between nodes to accurately # measure request timeouts, If disabled cassandra will assuming the request http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a96ec70/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 3e6abe1..fa8f273 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -49,15 +49,15 @@ public class Config public String initial_token; public Integer num_tokens = 1; - public volatile Long rpc_timeout_in_ms = new Long(10000); + public volatile Long request_timeout_in_ms = new Long(10000); - public Long read_rpc_timeout_in_ms = new Long(10000); + public Long read_request_timeout_in_ms = new Long(10000); - public Long range_rpc_timeout_in_ms = new Long(10000); + public Long range_request_timeout_in_ms = new Long(10000); - public Long write_rpc_timeout_in_ms = new Long(10000); + public Long write_request_timeout_in_ms = new Long(10000); - public Long truncate_rpc_timeout_in_ms = new Long(300000); + public Long truncate_request_timeout_in_ms = new Long(60000); public Integer streaming_socket_timeout_in_ms = new Integer(0); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a96ec70/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 1451e61..641ac64 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -735,52 +735,52 @@ public class DatabaseDescriptor public static long getRpcTimeout() { - return conf.rpc_timeout_in_ms; + return conf.request_timeout_in_ms; } public static void setRpcTimeout(Long timeOutInMillis) { - conf.rpc_timeout_in_ms = timeOutInMillis; + conf.request_timeout_in_ms = timeOutInMillis; } public static long getReadRpcTimeout() { - return conf.read_rpc_timeout_in_ms; + return conf.read_request_timeout_in_ms; } public static void setReadRpcTimeout(Long timeOutInMillis) { - conf.read_rpc_timeout_in_ms = timeOutInMillis; + conf.read_request_timeout_in_ms = timeOutInMillis; } public static long getRangeRpcTimeout() { - return conf.range_rpc_timeout_in_ms; + return conf.range_request_timeout_in_ms; } public static void setRangeRpcTimeout(Long timeOutInMillis) { - conf.range_rpc_timeout_in_ms = timeOutInMillis; + conf.range_request_timeout_in_ms = timeOutInMillis; } public static long getWriteRpcTimeout() { - return conf.write_rpc_timeout_in_ms; + return conf.write_request_timeout_in_ms; } public static void setWriteRpcTimeout(Long timeOutInMillis) { - conf.write_rpc_timeout_in_ms = timeOutInMillis; + conf.write_request_timeout_in_ms = timeOutInMillis; } public static long getTruncateRpcTimeout() { - return conf.truncate_rpc_timeout_in_ms; + return conf.truncate_request_timeout_in_ms; } public static void setTruncateRpcTimeout(Long timeOutInMillis) { - conf.truncate_rpc_timeout_in_ms = timeOutInMillis; + conf.truncate_request_timeout_in_ms = timeOutInMillis; } public static boolean hasCrossNodeTimeout() http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a96ec70/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index 0b69014..5329e1a 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -265,7 +265,7 @@ public final class MessagingService implements MessagingServiceMBean private final SimpleCondition listenGate; /** - * Verbs it's okay to drop if the request has been queued longer than RPC_TIMEOUT. These + * Verbs it's okay to drop if the request has been queued longer than the request timeout. These * all correspond to client requests or something triggered by them; we don't want to * drop internal messages like bootstrap or repair notifications. */