Update NoSQLBench to 5.21.1-preview & other minor updates

Author: msmygit

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "monthly"

CHANGELOG/CHANGELOG-2.1.md

@@ -21,4 +21,6 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 * [#48](https://github.com/datastax/zdm-proxy/issues/48) Fix scheduler shutdown race condition
 * [#69](https://github.com/datastax/zdm-proxy/issues/69) Client connection can be closed before proxy returns protocol error
 * [#76](https://github.com/datastax/zdm-proxy/issues/76) Log error when closing connection
-* [#74](https://github.com/datastax/zdm-proxy/issues/74) Handshakes with auth enabled can deadlock if multiple handshakes are happening concurrently
+* [#74](https://github.com/datastax/zdm-proxy/issues/74) Handshakes with auth enabled can deadlock if multiple handshakes are happening concurrently
+
+---

README.md

@@ -107,7 +107,7 @@ The setup we described above is only for testing in a local environment. It is *
 installation where the minimum number of proxy instances is 3.
 
 For a comprehensive guide with the recommended production setup check the documentation available at
-[DataStax Migration](https://docs.datastax.com/en/astra-serverless/docs/migrate/introduction.html).
+[DataStax Migration](https://docs.datastax.com/en/data-migration/introduction.html).
 
 There you'll find information about an Ansible-based tool that automates most of the process.
 
@@ -117,5 +117,5 @@ For information on the packaged dependencies of the Zero Downtime Migration (ZDM
 
 ## Frequently Asked Questions
 
-For frequently asked questions, please refer to our separate [FAQ](https://docs.datastax.com/en/astra-serverless/docs/migrate/faqs.html) page.
+For frequently asked questions, please refer to our separate [FAQ](https://docs.datastax.com/en/data-migration/faqs.html) page.
 

compose/nosqlbench-entrypoint.sh

@@ -1,6 +1,10 @@
 #!/bin/sh
-apk add --no-cache netcat-openbsd
-apk add py3-pip
+
+apt -qq update -y
+apt -qq install netcat-openbsd python3-pip -y
+
+echo "deb https://downloads.datastax.com/deb stable main" | tee -a /etc/apt/sources.list.d/datastax.sources.list
+curl -sL https://downloads.datastax.com/deb/doc/apt_key.gpg | apt-key add -
 pip install cqlsh
 
 function test_conn() {
@@ -23,56 +27,51 @@ echo "Creating schema"
 cat /source/nb-tests/schema.cql | cqlsh zdm_tests_proxy
 
 echo "Running NoSQLBench RAMPUP job"
-java -jar /nb.jar \
+java -jar /nb5.jar \
   --show-stacktraces \
   /source/nb-tests/cql-nb-activity.yaml \
   rampup \
-  driver=cqld3 \
   hosts=zdm_tests_proxy \
   localdc=datacenter1 \
-  errors=retry \
+  errors=counter,retry \
   -v
 
 echo "Running NoSQLBench WRITE job"
-java -jar /nb.jar \
+java -jar /nb5.jar \
   --show-stacktraces \
   /source/nb-tests/cql-nb-activity.yaml \
   write \
-  driver=cqld3 \
   hosts=zdm_tests_proxy \
   localdc=datacenter1 \
-  errors=retry \
+  errors=counter,retry \
   -v
 
 echo "Running NoSQLBench READ job"
-java -jar /nb.jar \
+java -jar /nb5.jar \
   --show-stacktraces \
   /source/nb-tests/cql-nb-activity.yaml \
   read \
-  driver=cqld3 \
   hosts=zdm_tests_proxy \
   localdc=datacenter1 \
-  errors=retry \
+  errors=counter,retry \
   -v
 
 echo "Running NoSQLBench VERIFY job on ORIGIN"
-java -jar /nb.jar \
+java -jar /nb5.jar \
   --show-stacktraces \
   --report-csv-to /source/verify-origin \
   /source/nb-tests/cql-nb-activity.yaml \
   verify \
-  driver=cqld3 \
   hosts=zdm_tests_origin \
   localdc=datacenter1 \
   -v
 
 echo "Running NoSQLBench VERIFY job on TARGET"
-java -jar /nb.jar \
+java -jar /nb5.jar \
   --show-stacktraces \
   --report-csv-to /source/verify-target \
   /source/nb-tests/cql-nb-activity.yaml \
   verify \
-  driver=cqld3 \
   hosts=zdm_tests_target \
   localdc=datacenter1 \
-  -v
+  -v

docker-compose-tests.yml

@@ -43,7 +43,7 @@ services:
         ipv4_address: 192.168.100.103
 
   nosqlbench:
-    image: nosqlbench/nosqlbench:4.15.101
+    image: nosqlbench/nosqlbench:5.21.1-preview
     container_name: zdm_tests_nb
     tty: true
     volumes:
@@ -52,4 +52,4 @@ services:
       - /source/compose/nosqlbench-entrypoint.sh
     networks:
       proxy:
-        ipv4_address: 192.168.100.104
+        ipv4_address: 192.168.100.104

nb-tests/cql-nb-activity.yaml

@@ -1,66 +1,50 @@
 bindings:
-  seq_key: Mod(<<keycount:1000000000>>); ToInt();
-  seq_value: Hash(); Mod(<<valuecount:1000000000>>); ToString() -> String
-  rw_key: <<keydist:Uniform(0,1000000000)->int>>;
-  rw_value: Hash(); <<valdist:Uniform(0,1000000000)->int>>; ToString() -> String
+  seq_key: Mod(TEMPLATE(keycount,1000000000)); ToInt();
+  seq_value: Hash(); Mod(TEMPLATE(valuecount,1000000000)); ToString() -> String
+  rw_key: TEMPLATE(keydist,Uniform(0,1000000000)->int);
+  rw_value: Hash(); TEMPLATE(valdist,Uniform(0,1000000000)->int); ToString() -> String
 
 scenarios:
-  rampup: run driver=cqld4 tags=phase:rampup cycles=20000
-  write: run driver=cqld4 tags=phase:write cycles=20000
-  read: run driver=cqld4 tags=phase:read cycles=20000
-  verify: run driver=cqld4 tags=phase:verify errors=warn,unverified->count compare=all cycles=20000
+  rampup: run driver=cqld4 tags=block:rampup cycles=20000
+  write: run driver=cqld4 tags=block:write cycles=20000
+  read: run driver=cqld4 tags=block:read cycles=20000
+  verify: run driver=cqld4 tags=block:verify errors=warn,unverified->count compare=all cycles=20000
+
+params:
+  driver: cql
+  prepared: true
 
 blocks:
-  - name: rampup
-    tags:
-      phase: rampup
+  rampup:
     params:
-      cl: <<write_cl:LOCAL_QUORUM>>
-      prepared: true
-    statements:
-      - rampup-insert: |
-          insert into <<keyspace:test>>.<<table:keyvalue>>
-          (key, value)
-          values ({seq_key},{seq_value});
-        tags:
-          name: rampup-insert
-  - name: verify
-    tags:
-      phase: verify
-      type: read
+      cl: TEMPLATE(write_cl,LOCAL_QUORUM)
+    ops:
+      rampup_insert: |
+        INSERT INTO TEMPLATE(keyspace,test).TEMPLATE(table,keyvalue)
+        (key, value)
+        VALUES ({seq_key},{seq_value});
+
+  verify:
     params:
-      cl: <<read_cl:LOCAL_QUORUM>>
-      prepared: true
-    statements:
-      - verify-select: |
-          select * from <<keyspace:test>>.<<table:keyvalue>> where key={rw_key};
-        verify-fields: key->rw_key, value->rw_value
-        tags:
-          name: verify
-  - name: read
-    tags:
-      phase: read
-      type: read
-      prepared: true
+      cl: TEMPLATE(read_cl,LOCAL_QUORUM)
+    ops:
+      verify_select: |
+        SELECT * FROM TEMPLATE(keyspace,test).TEMPLATE(table,keyvalue) WHERE key={rw_key};
+      verify_fields: key->rw_key, value->rw_value
+
+  read:
     params:
       ratio: 1
-      cl: <<read_cl:LOCAL_QUORUM>>
-    statements:
-      - main-select: |
-          select * from <<keyspace:test>>.<<table:keyvalue>> where key={rw_key};
-        tags:
-          name: main-select
-  - name: write
-    tags:
-      phase: write
-      type: write
-      prepared: true
+      cl: TEMPLATE(read_cl,LOCAL_QUORUM)
+    ops:
+      main_select: |
+        select * from TEMPLATE(keyspace,test).TEMPLATE(table,keyvalue) where key={rw_key};
+
+  write:
     params:
       ratio: 1
-      cl: <<write_cl:LOCAL_QUORUM>>
-    statements:
-      - main-insert: |
-          insert into <<keyspace:test>>.<<table:keyvalue>>
-          (key, value) values ({rw_key}, {rw_value});
-        tags:
-          name: main-insert
+      cl: TEMPLATE(write_cl,LOCAL_QUORUM)
+    ops:
+      main-insert: |
+        insert into TEMPLATE(keyspace,test).TEMPLATE(table,keyvalue)
+        (key, value) values ({rw_key}, {rw_value});