Merge branch 'main' into mysql-advanced-monitoring

Author: bpkroth

.github/workflows/maven.yml

@@ -303,16 +303,16 @@ jobs:
           distribution: 'temurin'
 
       - name: Set up Python
-        uses: actions/setup-python@v5  
-        with:  
-          python-version: ${{env.PYTHON_VERSION}}  
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{env.PYTHON_VERSION}}
 
-      - name: Install Python dependencies  
+      - name: Install Python dependencies
         working-directory: ./scripts/anonymization
         run: |
           if [[ ${{matrix.benchmark}} == anonymization ]]; then
             python -m pip install --upgrade pip
-            pip install -r requirements.txt  
+            pip install -r requirements.txt
           else
             echo "Dependency installation not necessary for benchmark"
           fi
@@ -635,10 +635,11 @@ jobs:
           ACCEPT_EULA: Y
           SA_PASSWORD: SApassword1
         options: >-
-          --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P SApassword1 -b -Q 'SELECT 1;'"
-          --health-interval 10s
+          --health-cmd="find /opt/mssql-tools*/bin/ -name sqlcmd -executable -print -quit | xargs -t -I% sh -c '% -C -S localhost -U sa -P SApassword1 -b -Q \"SELECT 1;\"'"
+          --health-interval 5s
           --health-timeout 5s
           --health-retries 5
+          --health-start-period 5s
         ports:
           - 1433:1433
     steps:

docker/postgres-latest/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     ports:
       - "5432:5432"
     healthcheck:
-      test: pg_isready
+      test: [ "CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -33,4 +33,4 @@ services:
     ports:
       - "8888:8080"
     volumes:
-      - ${PWD}/servers.json:/pgadmin4/servers.json
+      - ${PWD}/servers.json:/pgadmin4/servers.json

docker/postgres-latest/up.sh

@@ -10,10 +10,10 @@ docker compose up -d $services
 
 # Wait until ready
 for i in {1..5}; do
-    if docker exec postgres pg_isready && sleep 2 && docker exec postgres pg_isready; then
+    if /usr/bin/docker inspect --format="{{print .State.Health.Status}}" postgres | grep -q -x healthy; then
         break
     else
-        sleep 5
+        sleep 10
     fi
 done
 

docker/sqlserver-latest/docker-compose.yml

@@ -6,6 +6,12 @@ services:
     container_name: sqlserver
     hostname: sqlserver
     image: mcr.microsoft.com/mssql/server:latest
+    healthcheck:
+      test: ["CMD-SHELL", "find /opt/mssql-tools*/bin/ -name sqlcmd -executable -print -quit | xargs -t -I% sh -c '% -C -S localhost -U sa -P SApassword1 -b -Q \"SELECT 1;\"'"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+      start_period: 5s
     environment:
       ACCEPT_EULA: Y
       SA_PASSWORD: SApassword1

docker/sqlserver-latest/up.sh

@@ -6,11 +6,20 @@ cd "$scriptdir/"
 
 docker compose up -d
 
-network=$(docker ps --format "{{.Names}} {{.Networks}}" | awk '( $1 ~ /^'$BENCHBASE_PROFILE'/ ) { print $2 }')
+network=$(docker ps --format "{{.Names}} {{.Networks}}" | awk '( $1 ~ /^sqlserver/ ) { print $2 }')
 
 # Also setup the database for use with the sample configs.
 # See Also: .github/workflows/maven.yml
 
+# Wait until ready
+for i in {1..60}; do
+    if /usr/bin/docker inspect --format="{{print .State.Health.Status}}" sqlserver | grep -q -x healthy; then
+        break
+    else
+        sleep 5
+    fi
+done
+
 function run_sqlcmd_in_docker() {
     set -x
     docker run --rm --network=$network --entrypoint /opt/mssql-tools/bin/sqlcmd mcr.microsoft.com/mssql-tools:latest \

pom.xml

@@ -64,7 +64,7 @@
                 <dependency>
                     <groupId>org.xerial</groupId>
                     <artifactId>sqlite-jdbc</artifactId>
-                    <version>3.46.0.0</version>
+                    <version>3.46.1.3</version>
                 </dependency>
             </dependencies>
         </profile>
@@ -83,7 +83,7 @@
                 <dependency>
                     <groupId>org.postgresql</groupId>
                     <artifactId>postgresql</artifactId>
-                    <version>42.7.3</version>
+                    <version>42.7.4</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
@@ -125,7 +125,7 @@
                 <dependency>
                     <groupId>com.oracle.database.jdbc</groupId>
                     <artifactId>ojdbc11</artifactId>
-                    <version>23.4.0.24.05</version>
+                    <version>23.5.0.24.07</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
@@ -145,7 +145,7 @@
                 <dependency>
                     <groupId>org.mariadb.jdbc</groupId>
                     <artifactId>mariadb-java-client</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.4.1</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
@@ -165,7 +165,7 @@
                 <dependency>
                     <groupId>com.google.cloud</groupId>
                     <artifactId>google-cloud-spanner-jdbc</artifactId>
-                    <version>2.20.1</version>
+                    <version>2.22.1</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
@@ -185,7 +185,7 @@
                 <dependency>
                     <groupId>org.postgresql</groupId>
                     <artifactId>postgresql</artifactId>
-                    <version>42.7.3</version>
+                    <version>42.7.4</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
@@ -236,14 +236,14 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.13</version>
+            <version>2.0.16</version>
         </dependency>
 
         <dependency>
             <!-- Drop-in replacement of log4j -->
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-reload4j</artifactId>
-            <version>2.0.13</version>
+            <version>2.0.16</version>
         </dependency>
 
         <dependency>
@@ -262,19 +262,19 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.14.0</version>
+            <version>3.17.0</version>
         </dependency>
 
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.0</version>
         </dependency>
 
         <dependency>
@@ -451,7 +451,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -466,7 +466,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.1</version>
                 <configuration>
                     <useReleaseProfile>false</useReleaseProfile>
                     <tagNameFormat>v@{version}</tagNameFormat>
@@ -501,7 +501,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>analyze</id>
@@ -540,7 +540,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <mainClass>com.oltpbenchmark.DBWorkload</mainClass>
                 </configuration>