Merge pull request #1245 from dkropachev/dk/fix-system-local-query

Make any query on system.local go with WHERE clause

Author: dkropachev

scylla/src/cluster/metadata.rs

@@ -757,7 +757,7 @@ async fn query_peers(
         .and_then(|row_result| future::ok((NodeInfoSource::Peer, row_result)));
 
     let mut local_query =
-        Query::new("select host_id, rpc_address, data_center, rack, tokens from system.local");
+        Query::new("select host_id, rpc_address, data_center, rack, tokens from system.local WHERE key='local'");
     local_query.set_page_size(METADATA_QUERY_PAGE_SIZE);
     let local_query_stream = conn
         .clone()

scylla/src/network/connection.rs

@@ -2586,7 +2586,7 @@ mod tests {
         // As everything is normal, these queries should succeed.
         for _ in 0..3 {
             tokio::time::sleep(Duration::from_millis(500)).await;
-            conn.query_unpaged("SELECT host_id FROM system.local")
+            conn.query_unpaged("SELECT host_id FROM system.local WHERE key='local'")
                 .await
                 .unwrap();
         }
@@ -2610,7 +2610,7 @@ mod tests {
 
         // As the router is invalidated, all further queries should immediately
         // return error.
-        conn.query_unpaged("SELECT host_id FROM system.local")
+        conn.query_unpaged("SELECT host_id FROM system.local WHERE key='local'")
             .await
             .unwrap_err();
 

scylla/src/utils/test_utils.rs

@@ -54,7 +54,10 @@ pub(crate) async fn supports_feature(session: &Session, feature: &str) -> bool {
     }
 
     let result = session
-        .query_unpaged("SELECT supported_features FROM system.local", ())
+        .query_unpaged(
+            "SELECT supported_features FROM system.local WHERE key='local'",
+            (),
+        )
         .await
         .unwrap()
         .into_rows_result()

scylla/tests/integration/history.rs

@@ -111,7 +111,7 @@ async fn successful_query_history() {
     setup_tracing();
     let session = create_new_session_builder().build().await.unwrap();
 
-    let mut query = Query::new("SELECT * FROM system.local");
+    let mut query = Query::new("SELECT * FROM system.local WHERE key='local'");
     let history_collector = Arc::new(HistoryCollector::new());
     query.set_history_listener(history_collector.clone());
 

scylla/tests/integration/new_session.rs

@@ -20,7 +20,7 @@ async fn proceed_if_only_some_hostnames_are_invalid() {
         .await
         .unwrap();
     session
-        .query_unpaged("SELECT host_id FROM system.local", &[])
+        .query_unpaged("SELECT host_id FROM system.local WHERE key='local'", &[])
         .await
         .unwrap();
 }

scylla/tests/integration/utils.rs

@@ -113,7 +113,10 @@ pub(crate) async fn supports_feature(session: &Session, feature: &str) -> bool {
     }
 
     let result = session
-        .query_unpaged("SELECT supported_features FROM system.local", ())
+        .query_unpaged(
+            "SELECT supported_features FROM system.local WHERE key='local'",
+            (),
+        )
         .await
         .unwrap()
         .into_rows_result()

test/cluster/docker-compose-passauth.yml

@@ -22,7 +22,7 @@ services:
     ports:
       - "9042:9042"
     healthcheck:
-      test: [ "CMD", "cqlsh", "scylla", "-e", "select * from system.local" ]
+      test: [ "CMD", "cqlsh", "scylla", "-e", "select * from system.local WHERE key='local'" ]
       interval: 5s
       timeout: 5s
       retries: 60

test/cluster/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       --smp 2
       --memory 1G
     healthcheck:
-      test: [ "CMD", "cqlsh", "scylla1", "-e", "select * from system.local" ]
+      test: [ "CMD", "cqlsh", "scylla1", "-e", "select * from system.local WHERE key='local'" ]
       interval: 5s
       timeout: 5s
       retries: 60
@@ -41,7 +41,7 @@ services:
       --smp 2
       --memory 1G
     healthcheck:
-      test: [ "CMD", "cqlsh", "scylla2", "-e", "select * from system.local" ]
+      test: [ "CMD", "cqlsh", "scylla2", "-e", "select * from system.local WHERE key='local'" ]
       interval: 5s
       timeout: 5s
       retries: 60
@@ -62,7 +62,7 @@ services:
       --smp 2
       --memory 1G
     healthcheck:
-      test: [ "CMD", "cqlsh", "scylla3", "-e", "select * from system.local" ]
+      test: [ "CMD", "cqlsh", "scylla3", "-e", "select * from system.local WHERE key='local'" ]
       interval: 5s
       timeout: 5s
       retries: 60

test/tls/docker-compose-tls.yml

@@ -22,7 +22,7 @@ services:
       - "9042:9042"
       - "9142:9142"
     healthcheck:
-      test: [ "CMD", "cqlsh", "scylla", "-e", "select * from system.local" ]
+      test: [ "CMD", "cqlsh", "scylla", "-e", "select * from system.local WHERE key='local'" ]
       interval: 5s
       timeout: 5s
       retries: 60