Merge branch 'main' into larger_runner

Author: rowanseymour

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest-m
     container:
-      image: node:18
+      image: node:20
     strategy:
       matrix:
         searchdb-host: [elastic7, elastic8, opensearch1, opensearch2]
@@ -25,18 +25,21 @@ jobs:
         image: elasticsearch:7.17.9
         env:
           discovery.type: single-node
+        options: --ulimit memlock=-1:-1 --ulimit nofile=65536:65536
       elastic8:
         image: elasticsearch:8.13.4
         env:
           discovery.type: single-node
           xpack.security.enabled: false
+        options: --ulimit memlock=-1:-1 --ulimit nofile=65536:65536
       opensearch1:
         image: opensearchproject/opensearch:1.3.16
         env:
           discovery.type: single-node
           plugins.security.disabled: true
           OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
           DISABLE_INSTALL_DEMO_CONFIG: true
+        options: --ulimit memlock=-1:-1 --ulimit nofile=65536:65536
       opensearch2:
         image: opensearchproject/opensearch:2.13.0
         env:
@@ -45,13 +48,14 @@ jobs:
           OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
           DISABLE_INSTALL_DEMO_CONFIG: true
           OPENSEARCH_INITIAL_ADMIN_PASSWORD: temba
+        options: --ulimit memlock=-1:-1 --ulimit nofile=65536:65536
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.go-version }}
 
@@ -65,7 +69,7 @@ jobs:
 
       - name: Upload coverage
         if: success()
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

CHANGELOG.md

@@ -1,3 +1,8 @@
+v9.1.3 (2024-05-16)
+-------------------------
+ * Reduce batch size to 100,000
+ * Test with OpenSearch 2.13 as well
+
 v9.1.2 (2024-05-14)
 -------------------------
  * Remove deprecated _doc from mapping to support ES8 / OS2

indexers/contacts.go

@@ -150,7 +150,7 @@ SELECT org_id, id, modified_on, is_active, row_to_json(t) FROM (
 	FROM contacts_contact
 	WHERE modified_on >= $1
 	ORDER BY modified_on ASC
-	LIMIT 500000
+	LIMIT 100000
 ) t;
 `