Merge pull request #413 from weaviate/improve_dynamic

Use batch queue info from weaviate to improve dynamic batching
weaviate · Aug 14, 2023 · 86fac1a · 86fac1a
2 parents f5a6864 + 36febd1
commit 86fac1a
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 350 deletions.
diff --git a/ci/docker-compose-azure.yml b/ci/docker-compose-azure.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.20.0-prealpha-628c8ff
+    image: semitechnologies/weaviate:preview-add-batch-queue-congestion-info-to-node-status-c14301b
     ports:
       - 8081:8081
     restart: on-failure:0

diff --git a/ci/docker-compose-cluster.yml b/ci/docker-compose-cluster.yml
@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   weaviate-node-1:
-    image: semitechnologies/weaviate:1.20.0-prealpha-628c8ff
+    image: semitechnologies/weaviate:preview-add-batch-queue-congestion-info-to-node-status-c14301b
     restart: on-failure:0
     ports:
       - "8087:8080"

diff --git a/ci/docker-compose-okta-cc.yml b/ci/docker-compose-okta-cc.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.20.0-prealpha-628c8ff
+    image: semitechnologies/weaviate:preview-add-batch-queue-congestion-info-to-node-status-c14301b
     ports:
       - 8082:8082
     restart: on-failure:0

diff --git a/ci/docker-compose-okta-users.yml b/ci/docker-compose-okta-users.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.20.0-prealpha-628c8ff
+    image: semitechnologies/weaviate:preview-add-batch-queue-congestion-info-to-node-status-c14301b
     ports:
       - 8083:8083
     restart: on-failure:0

diff --git a/ci/docker-compose-openai.yml b/ci/docker-compose-openai.yml
@@ -9,7 +9,7 @@ services:
       - '8086'
       - --scheme
       - http
-    image: semitechnologies/weaviate:1.20.0-prealpha-628c8ff
+    image: semitechnologies/weaviate:preview-add-batch-queue-congestion-info-to-node-status-c14301b
     ports:
       - 8086:8086
     restart: on-failure:0

diff --git a/ci/docker-compose-wcs.yml b/ci/docker-compose-wcs.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.20.0-prealpha-628c8ff
+    image: semitechnologies/weaviate:preview-add-batch-queue-congestion-info-to-node-status-c14301b
     ports:
       - 8085:8085
     restart: on-failure:0

diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.20.0-prealpha-7702266
+    image: semitechnologies/weaviate:preview-add-batch-queue-congestion-info-to-node-status-c14301b
     ports:
       - "8080:8080"
       - "50051:50051"

diff --git a/integration/test_cluster.py b/integration/test_cluster.py
@@ -4,8 +4,8 @@
 
 import weaviate
 
-GIT_HASH = "7702266"
-SERVER_VERSION = "1.20.0-prealpha"
+GIT_HASH = "c14301b"
+SERVER_VERSION = "1.20.5"
 NODE_NAME = "node1"
 NUM_OBJECT = 10
 

diff --git a/integration/test_stress.py b/integration/test_stress.py
@@ -1,10 +1,10 @@
 import datetime
 import random
-import uuid
 from dataclasses import dataclass, field
 from typing import List, Dict, Optional, Any
 
 import pytest
+import uuid
 
 import weaviate