From a60cccface0a035cc62e4b744f8146a7633a0b73 Mon Sep 17 00:00:00 2001
From: Andrey Yegorov <andrey.yegorov@datastax.com>
Date: Tue, 18 Jun 2024 15:32:16 -0700
Subject: [PATCH] another try

---
 .../TestCompatUpgradeDowngrade.groovy         | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeDowngrade.groovy b/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeDowngrade.groovy
index cba46e78374..0423aeda1da 100644
--- a/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeDowngrade.groovy
+++ b/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeDowngrade.groovy
@@ -18,6 +18,7 @@
 package org.apache.bookkeeper.tests.backwardcompat
 
 import com.github.dockerjava.api.DockerClient
+import com.google.common.collect.Lists
 import org.apache.bookkeeper.tests.integration.utils.BookKeeperClusterUtils
 import org.apache.bookkeeper.tests.integration.utils.MavenClassLoader
 import org.jboss.arquillian.junit.Arquillian
@@ -62,17 +63,31 @@ class TestCompatUpgradeDowngrade {
 
         LOG.info("Setting ledger storage")
 
-        for (String version: BookKeeperClusterUtils.OLD_CLIENT_VERSIONS) {
+        List<String> versions = Lists.newArrayList(BookKeeperClusterUtils.OLD_CLIENT_VERSIONS)
+        versions.add(BookKeeperClusterUtils.CURRENT_VERSION)
+
+        for (String version: versions) {
             BookKeeperClusterUtils.appendToAllBookieConf(docker, version,
                     "ledgerStorageClass",
                     "org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage")
+
+            try {
+                BookKeeperClusterUtils.appendToAllBookieConf(docker, version,
+                        "dbStorage_rocksDB_format_version",
+                        "2")
+                BookKeeperClusterUtils.appendToAllBookieConf(docker, version,
+                        "dbStorage_rocksDB_checksum_type",
+                        "kCRC32c")
+                BookKeeperClusterUtils.appendToAllBookieConf(docker, version,
+                        "conf/default_rocksdb.conf.default",
+                        "format_version",
+                        "2")
+            } catch (Exception e) {
+                LOG.warn(version + ": Failed to set rocksdb configs, might be ok for some older version", e)
+            }
         }
-        BookKeeperClusterUtils.appendToAllBookieConf(docker, BookKeeperClusterUtils.CURRENT_VERSION,
-                "ledgerStorageClass",
-                "org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage")
     }
 
-
     // will ignore older non-supported versions
 
     @Test
@@ -103,16 +118,6 @@ class TestCompatUpgradeDowngrade {
     @Test
     public void upgradeDowngrade_015() {
         String currentVersion = BookKeeperClusterUtils.CURRENT_VERSION
-        BookKeeperClusterUtils.appendToAllBookieConf(docker, currentVersion,
-                "dbStorage_rocksDB_format_version",
-                "2")
-        BookKeeperClusterUtils.appendToAllBookieConf(docker, currentVersion,
-                "dbStorage_rocksDB_checksum_type",
-                "kCRC32c")
-        BookKeeperClusterUtils.appendToAllBookieConf(docker, currentVersion,
-                "conf/default_rocksdb.conf.default",
-                "format_version",
-                "2")
         upgradeDowngrade("4.17.0", currentVersion)
     }