Update tests to 1.34

Author: melgenek

Makefile

@@ -13,10 +13,12 @@ build:
 .PHONY: run-tests
 run-tests:
 	docker compose -f tests/fdb/docker-compose.yaml up --build --exit-code-from tests --abort-on-container-exit
+	docker compose -f tests/fdb/docker-compose.yaml down
 
 .PHONY: run-tests-api
 run-tests-api:
 	docker compose -f tests/api/docker-compose.yaml up --build --exit-code-from tests --abort-on-container-exit
+	docker compose -f tests/api/docker-compose.yaml down
 
 .PHONY: start-k3s
 start-k3s:

pkg/drivers/fdb/fdb_test.go

@@ -177,7 +177,7 @@ func TestFDB(t *testing.T) {
 			rev, result, err = f.List(ctx, "/abc/", "/abc/key", 0, currentRev, false)
 			require.NoError(t, err)
 			require.Equal(t, valuesAsSlice(events), result)
-			require.Equal(t, currentRev, rev)
+			require.LessOrEqual(t, currentRev, rev)
 
 			_, resultKeysOnly, err := f.List(ctx, "/abc/", "/abc/key", 0, currentRev, true)
 			require.NoError(t, err)
@@ -189,7 +189,7 @@ func TestFDB(t *testing.T) {
 
 			rev, result, err = f.List(ctx, keyName, keyName, 0, currentRev, false)
 			require.NoError(t, err)
-			require.Equal(t, nextRev, rev)
+			require.LessOrEqual(t, nextRev, rev)
 			require.Equal(t, []*server.KeyValue{event}, result)
 
 			rev, result, err = f.List(ctx, "/", keyName, 0, currentRev, false)

tests/api/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   fdb-test:
-    container_name: fdb-test-api
+    container_name: fdb-test
     image: ghcr.io/melgenek/f8n/foundationdb:7.3.69
     post_start:
      - command: >

tests/k3s/docker-compose.yaml

@@ -54,7 +54,7 @@ services:
     container_name: k3s
     depends_on:
       - f8n
-    image: docker.io/rancher/k3s:v1.33.3-k3s1
+    image: docker.io/rancher/k3s:v1.34.1-k3s1
     privileged: true
     command:
       - server

tests/load/scripts/histogram.py

@@ -16,7 +16,7 @@
 METRIC = 'etcd_request_duration_seconds'
 
 
-def main(type, *args, **kwargs):
+def main(resource, *args, **kwargs):
     global v1
 
     try:
@@ -44,11 +44,11 @@ def main(type, *args, **kwargs):
                 k, v = part.split('=')
                 labels[k] = v.strip('"')
 
-            if not labels.get('type', '').endswith(type):
+            if not labels.get('resource', '').endswith(resource):
                 continue
 
             if labels['operation'] not in operations:
-                operations[labels['operation']] = {'counts': [], 'buckets': [], 'type': labels['type']}
+                operations[labels['operation']] = {'counts': [], 'buckets': [], 'resource': labels['resource']}
                 prev_value = 0
 
             if metric.endswith('_bucket'):
@@ -61,15 +61,15 @@ def main(type, *args, **kwargs):
                 operations[labels['operation']]['count'] = value
 
     for operation, stats in operations.items():
-        print(f"\n{stats['sum'] / stats['count']:.3f}  average {kwargs['backend_name']} request duration (seconds): {operation} {stats['type']}")
+        print(f"\n{stats['sum'] / stats['count']:.3f}  average {kwargs['backend_name']} request duration (seconds): {operation} {stats['resource']}")
         fig = tpl.figure()
         fig.barh(stats['counts'], stats['buckets'], max_width=50)
         fig.show()
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument('--type', '-t', type=str, required=False, default='configmaps')
+    parser.add_argument('--resource', '-t', type=str, required=False, default='configmaps')
     parser.add_argument('--log-level', '-l', type=str, required=False, default='INFO')
     parser.add_argument('--backend-name', '-b', type=str, required=False, default='etcd')
     args = parser.parse_args()

tests/load/scripts/loadmap.py

@@ -57,39 +57,41 @@ def main(rounds, *args, **kwargs):
 def update_or_merge_configmap(cm):
     while True:
         try:
-            logging.debug(f"Updating {cm.metadata.name} rev={cm.metadata.resource_version}")
+            # Always fetch latest version first
+            latest_cm = v1.read_namespaced_config_map(name=cm.metadata.name, namespace=namespace)
+            if not latest_cm.data:
+                latest_cm.data = {}
+            # Merge new data
+            latest_cm.data.update(cm.data)
+            cm = latest_cm
+
+            # Replace using the correct resourceVersion
             return v1.replace_namespaced_config_map(name=cm.metadata.name, namespace=namespace, body=cm)
         except client.exceptions.ApiException as e:
             logging.debug(f"\tError: {e.status}")
-            if e.status == 409 and 'StorageError: invalid object' in e.body:
-                logging.debug("\tCreating and merging...")
-                cm1 = create_or_get_configmap(cm)
-                if not cm1.data:
-                    cm1.data = dict()
-                cm1.data.update(cm.data)
-                cm = cm1
-            elif e.status == 409:
-                logging.debug("\tReading and merging...")
+            if e.status == 404:
+                # ConfigMap doesn't exist, try to create it
+                cm.metadata.resource_version = None  # must be None for create
                 try:
-                    cm1 = v1.read_namespaced_config_map(name=cm.metadata.name, namespace=namespace)
-                    if not cm1.data:
-                        cm1.data = dict()
-                    cm1.data.update(cm.data)
-                    cm = cm1
+                    return v1.create_namespaced_config_map(namespace=namespace, body=cm)
                 except client.exceptions.ApiException as e1:
-                    if e1.status == 404:
-                        pass
+                    if e1.status == 409:
+                        # Someone else created it, retry merge
+                        continue
                     else:
-                        raise e1
+                        raise
+            elif e.status == 409:
+                # Conflict, retry with latest version
+                continue
             else:
-                raise e
+                raise
 
 
 def create_or_get_configmap(cm):
-    cm.metadata.resource_version = ''
     while True:
         try:
             logging.debug(f"Creating {cm.metadata.name}")
+            cm.metadata.resource_version = None  # must be None for create
             return v1.create_namespaced_config_map(namespace=namespace, body=cm)
         except client.exceptions.ApiException as e:
             logging.debug(f"\tError: {e.status}")