Merge branch 'hotfix/5.18.3' into develop

Author: danovaro

VERSION

@@ -1 +1 @@
-5.18.2
+5.18.3

src/fdb5/remote/server/CatalogueHandler.cc

@@ -437,7 +437,9 @@ void CatalogueHandler::archiveBlob(const uint32_t clientID, const uint32_t reque
         }
     }
 
-    it->second.catalogue->selectIndex(idxKey);
+    if (!it->second.catalogue->selectIndex(idxKey)) {
+        it->second.catalogue->createIndex(idxKey, datumKey.keys().size());
+    }
     it->second.catalogue->archive(idxKey, datumKey, std::move(location));
     {
         std::lock_guard<std::mutex> lock(fieldLocationsMutex_);

tests/regressions/CMakeLists.txt

@@ -33,7 +33,8 @@ if (HAVE_FDB_BUILD_TOOLS) # test scripts use the fdb tools
 
         if (HAVE_GRIB)
             add_subdirectory(FDB-258)
-            add_subdirectory(FDB-491)
+            # add_subdirectory(FDB-491)
+            add_subdirectory(FDB-595)
         endif()
 
     endif()

tests/regressions/FDB-595/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Run remote API tests, but with the singleConnection option set in the server configs
+
+ecbuild_configure_file( FDB-595.sh.in FDB-595.sh @ONLY )
+
+ecbuild_add_test(
+    TYPE     SCRIPT
+    COMMAND  FDB-595.sh
+    ENVIRONMENT "${test_environment}" )

tests/regressions/FDB-595/FDB-595.sh.in

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+set -eux
+
+fdbwrite="$<TARGET_FILE:fdb-write>"
+fdblist="$<TARGET_FILE:fdb-list>"
+fdbserver="$<TARGET_FILE:fdb-server>"
+
+srcdir=@CMAKE_CURRENT_SOURCE_DIR@
+bindir=@CMAKE_CURRENT_BINARY_DIR@
+
+export FDB_HOME=$bindir
+
+export FDB_DEBUG=0
+export ECKIT_DEBUG=0
+
+rm -f out.*
+rm -rf ${bindir}/catalogue_root
+rm -rf ${bindir}/store_root
+mkdir -p ${bindir}/catalogue_root
+mkdir -p ${bindir}/store_root
+
+for f in catalogue.yaml store.yaml client.yaml levtypes.grib
+do
+    cp $srcdir/$f $bindir
+done
+
+cp $srcdir/schema $bindir
+
+export FDB_HOME=$bindir
+
+FDB5_CONFIG_FILE=$bindir/catalogue.yaml $fdbserver &
+catal_pid=$!
+
+FDB5_CONFIG_FILE=$bindir/store.yaml $fdbserver &
+store_pid=$!
+
+export FDB5_CONFIG_FILE=$bindir/client.yaml
+$fdbwrite levtypes.grib
+
+cat > list <<EOF
+{class=od,expver=0001,stream=oper,date=20251125,time=0000,domain=g}{type=fc,levtype=sfc}{step=0,param=167}
+{class=od,expver=0001,stream=oper,date=20251125,time=0000,domain=g}{type=fc,levtype=pl}{step=0,levelist=1000,param=130}
+EOF
+
+$fdblist --all --minimum-keys="" --porcelain | tee out
+
+kill -9 $catal_pid
+kill -9 $store_pid
+
+cmp out list
+

tests/regressions/FDB-595/catalogue.yaml

@@ -0,0 +1,11 @@
+---
+type: catalogue
+supportedConnections: [1]
+serverPort: 11000
+stores:
+- default: "localhost:11001"
+schema: ~fdb/schema
+spaces:
+- handler: Default
+  roots:
+    - path: ./catalogue_root

tests/regressions/FDB-595/client.yaml

@@ -0,0 +1,6 @@
+---
+type: remote
+store: remote
+engine: remote
+host: localhost
+port: 11000

tests/regressions/FDB-595/levtypes.grib

@@ -0,0 +1,11 @@
+param:      Param;
+step:       Step;
+date:       Date;
+levelist:   Double;
+expver:     Expver;
+time:       Time;
+
+[ class, expver, stream=oper, date, time, domain?
+       [ type, levtype
+               [ step, levelist?, param ]]
+]

tests/regressions/FDB-595/schema

@@ -0,0 +1,8 @@
+---
+type: store
+supportedConnections: [1]
+serverPort: 11001
+spaces:
+- handler: Default
+  roots:
+  - path: ./store_root