Merge remote-tracking branch 'upstream/main' into easier_access_to_shard_awareness_api

Conflicts:
	scylla/src/transport/session.rs

Author: Ten0

.github/workflows/authenticate_test.yml

@@ -22,6 +22,6 @@ jobs:
           - 9042:9042
         options: --health-cmd "cqlsh --username cassandra --password cassandra --debug" --health-interval 5s --health-retries 30
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Run tests
       run: cargo test --verbose authenticate_superuser -- custom_authentication --ignored

.github/workflows/book.yml

@@ -22,7 +22,7 @@ jobs:
           - 9042:9042
         options: --health-cmd "cqlsh --debug" --health-interval 5s --health-retries 10
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install mdbook
       run: cargo install mdbook --no-default-features
     - name: Build the project

.github/workflows/cassandra.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup 3-node Cassandra cluster
       run: |
-        docker-compose -f test/cluster/cassandra/docker-compose.yml up -d
+        docker compose -f test/cluster/cassandra/docker-compose.yml up -d --wait
       # A separate step for building to separate measuring time of compilation and testing
     - name: Build the project
       run: cargo build --verbose --tests
@@ -28,9 +28,9 @@ jobs:
         CDC='disabled' SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --verbose -- --skip test_views_in_schema_info
     - name: Stop the cluster
       if: ${{ always() }}
-      run: docker-compose -f test/cluster/cassandra/docker-compose.yml stop
+      run: docker compose -f test/cluster/cassandra/docker-compose.yml stop
     - name: Print the cluster logs
       if: ${{ always() }}
-      run: docker-compose -f test/cluster/cassandra/docker-compose.yml logs
+      run: docker compose -f test/cluster/cassandra/docker-compose.yml logs
     - name: Remove cluster
-      run: docker-compose -f test/cluster/cassandra/docker-compose.yml down
+      run: docker compose -f test/cluster/cassandra/docker-compose.yml down

.github/workflows/rust.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup 3-node Scylla cluster
       run: |
         sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
-        docker-compose -f test/cluster/docker-compose.yml up -d
+        docker compose -f test/cluster/docker-compose.yml up -d --wait
     - name: Format check
       run: cargo fmt --verbose --all -- --check
     - name: Clippy check
@@ -38,23 +38,22 @@ jobs:
       run: SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --verbose
     - name: Stop the cluster
       if: ${{ always() }}
-      run: docker-compose -f test/cluster/docker-compose.yml stop
+      run: docker compose -f test/cluster/docker-compose.yml stop
     - name: Print the cluster logs
       if: ${{ always() }}
-      run: docker-compose -f test/cluster/docker-compose.yml logs
+      run: docker compose -f test/cluster/docker-compose.yml logs
     - name: Remove cluster
-      run: docker-compose -f test/cluster/docker-compose.yml down
+      run: docker compose -f test/cluster/docker-compose.yml down
 
   # Tests that our current minimum supported rust version compiles everything sucessfully
   min_rust:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install Rust ${{ env.rust_min }}
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: ${{ env.rust_min }}
-        override: true
+      run: |
+        rustup install ${{ env.rust_min }}
+        rustup override set ${{ env.rust_min }}
     - name: Print Rust version
       run: rustc --version
     - name: MSRV cargo check with features
@@ -68,6 +67,6 @@ jobs:
   cargo_docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Compile docs
       run: RUSTDOCFLAGS=-Dwarnings cargo doc

.github/workflows/serverless.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install scylla-ccm
         run: pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
 

.github/workflows/tls.yml

@@ -27,7 +27,7 @@ jobs:
     env:
       working-directory: ./scylla
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Check
       run: cargo check --verbose --features "ssl"
       working-directory: ${{env.working-directory}}

CONTRIBUTING.md

@@ -31,10 +31,10 @@ Currently, we require new PRs to compile without warnings, pass `cargo fmt` and
 ## Testing
 
 A 3-node ScyllaDB cluster is required to run the tests.
-The simplest way to set it up locally is to use a `docker-compose`.
-Fortunately there is no need to invoke `docker-compose` manually, everything can be handled by our `Makefile`.
+The simplest way to set it up locally is to use a `docker compose`.
+Fortunately there is no need to invoke `docker compose` manually, everything can be handled by our `Makefile`.
 
-To run a cargo test suite, use the command below (note that you must have docker and docker-compose installed):
+To run a cargo test suite, use the command below (note that you must have Docker and Docker Compose V2 installed):
 ```bash
 make test
 ```

Makefile

@@ -1,4 +1,4 @@
-COMPOSE := docker-compose -f test/cluster/docker-compose.yml
+COMPOSE := docker compose -f test/cluster/docker-compose.yml
 
 .PHONY: all
 all: test
@@ -30,14 +30,14 @@ clippy:
 	RUSTFLAGS=-Dwarnings cargo clippy --examples --tests -- -Aclippy::uninlined_format_args
 
 .PHONY: test
-test: up wait-for-cluster
+test: up
 	SCYLLA_URI=172.42.0.2:9042 \
 	 SCYLLA_URI2=172.42.0.3:9042 \
 	 SCYLLA_URI3=172.42.0.4:9042 \
 	 cargo test
 
 .PHONY: dockerized-test
-dockerized-test: up wait-for-cluster
+dockerized-test: up
 	test/dockerized/run.sh
 
 .PHONY: build
@@ -50,7 +50,7 @@ docs:
 
 .PHONY: up
 up:
-	$(COMPOSE) up -d
+	$(COMPOSE) up -d --wait
 	@echo
 	@echo "ScyllaDB cluster is running in the background. Use 'make down' to stop it."
 	@echo
@@ -75,7 +75,3 @@ shell:
 clean: down
 	cargo clean
 	rm -rf docs/book
-
-.PHONY: wait-for-cluster
-wait-for-cluster:
-	@test/cluster/wait.sh

docs/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "sphinx-docs"
 description = "ScyllaDB Documentation"
-version = "0.8.2"
+version = "0.9.0"
 authors = ["ScyllaDB Documentation Contributors"]
 
 [tool.poetry.dependencies]

docs/source/load-balancing/default-policy.md

@@ -10,8 +10,7 @@ for queries with non-local consistency mode is also supported.
 `builder()` method of `DefaultPolicy` returns a new instance of
 `DefaultPolicyBuilder` with the following default values:
 
-- `preferred_datacenter`: `None`
-- `preferred_rack`: `None`
+- `preferences`: no particular datacenter/rack preference
 - `is_token_aware`: `true`
 - `permit_dc_failover`: `false`
 - `latency_awareness`: `None`
@@ -25,8 +24,7 @@ You can use the builder methods to configure the desired settings and create a
 use scylla::load_balancing::DefaultPolicy;
 
 let default_policy = DefaultPolicy::builder()
-        .prefer_datacenter("dc1".to_string())
-        .prefer_rack("rack1".to_string())
+        .prefer_datacenter_and_rack("dc1".to_string(), "rack1".to_string())
         .token_aware(true)
         .permit_dc_failover(true)
         .build();
@@ -35,36 +33,40 @@ let default_policy = DefaultPolicy::builder()
 
 ### Semantics of `DefaultPolicy`
 
-#### Preferred Datacenter
+#### Preferences
+
+The `preferences` field in `DefaultPolicy` allows the load balancing
+policy to prioritize nodes based on their location. It has three modes:
+
+- no preference
+- preferred datacenter
+- preferred datacenter and rack
 
-The `preferred_datacenter` field in `DefaultPolicy` allows the load balancing
-policy to prioritize nodes based on their location. When a preferred datacenter
-is set, the policy will treat nodes in that datacenter as "local" nodes, and
-nodes in other datacenters as "remote" nodes. This affects the order in which
-nodes are returned by the policy when selecting replicas for read or write
-operations. If no preferred datacenter is specified, the policy will treat all
-nodes as local nodes.
+When a datacenter `"my_dc"` is preferred, the policy will treat nodes in `"my_dc"`
+as "local" nodes, and nodes in other datacenters as "remote" nodes. This affects
+the order in which nodes are returned by the policy when selecting nodes for
+read or write operations. If no datacenter is preferred, the policy will treat
+all nodes as local nodes.
+
+`preferences` allow the load balancing policy to prioritize nodes based on their
+availability zones (racks) in the preferred datacenter, too. When a datacenter
+and a rack are preferred, the policy will first return replicas in the local rack
+in the preferred datacenter, and then the other replicas in the datacenter
+(followed by remote replicas). After replicas, the other node will be ordered
+similarly, too (local rack nodes, local datacenter nodes, remote nodes).
 
 When datacenter failover is disabled (`permit_dc_failover` is set to
 false), the default policy will only include local nodes in load balancing
 plans. Remote nodes will be excluded, even if they are alive and available to
 serve requests.
 
-#### Preferred Rack
-
-The `preferred_rack` field in `DefaultPolicy` allows the load balancing policy to
-prioritize nodes based on their availability zones in the preferred datacenter.
-When a preferred rack is set, the policy will first return replicas in the local rack
-in the preferred datacenter, and then the other replicas in the datacenter.
-When a preferred datacenter is not set, setting preferred rack will not have any effect.
-
 #### Datacenter Failover
 
 In the event of a datacenter outage or network failure, the nodes in that
 datacenter may become unavailable, and clients may no longer be able to access
-the data stored on those nodes. To address this, the `DefaultPolicy` supports datacenter
-failover, which allows to route requests to nodes in other datacenters if the
-local nodes are unavailable.
+the data stored on those nodes. To address this, the `DefaultPolicy` supports
+datacenter failover, which allows to route requests to nodes in other datacenters
+if the local nodes are unavailable.
 
 Datacenter failover can be enabled in `DefaultPolicy` by `permit_dc_failover`
 setting in the builder. When this flag is set, the policy will prefer to return