Test FLX sync geospatial queries (#7042)

ironage · danieltabacaru · web-flow · commit 7556b535aa7b · 2023-11-07T12:50:04.000+02:00
* add tests for FLX geospatial

* update tests for new BAAS error messages

* fix several hangs in tests

download/upload/advance may have already happened
by the time the test code gets to the wait_for_upload() line
which results in the test hanging forever because there are no further
changes. A fix is to do a timed wait for the expected state which will
succeed immediately if the same race occurs.

* revert polling waits in tests

* fix an error if recovering schema changes in dev mode

* add additional tests

* don't overcomplicate the test

* lint

---------

Co-authored-by: Daniel Tabacaru &lt;96778637+danieltabacaru@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Fixed
 * <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)
 * A crash at a very specific time during a DiscardLocal client reset on a FLX Realm could leave subscriptions in an invalid state ([#7110](https://github.com/realm/realm-core/pull/7110), since v12.3.0).
+* Fixed an error "Invalid schema change (UPLOAD): cannot process AddColumn instruction for non-existent table" when using automatic client reset with recovery in dev mode to recover schema changes made locally while offline. ([#7042](https://github.com/realm/realm-core/pull/7042) since the server introduced the feature that allows client to redefine the server's schema if the server is in dev mode - fall 2023)
 
 ### Breaking changes
 * None.
diff --git a/dependencies.list b/dependencies.list
@@ -2,4 +2,4 @@ PACKAGE_NAME=realm-core
 VERSION=13.23.3
 OPENSSL_VERSION=3.0.8
 ZLIB_VERSION=1.2.13
-MDBREALM_TEST_SERVER_TAG=2023-08-11
+MDBREALM_TEST_SERVER_TAG=2023-10-20
diff --git a/evergreen/config.yml b/evergreen/config.yml
@@ -887,7 +887,7 @@ tasks:
   commands:
   - func: "launch remote baas"
     vars:
-      baas_branch: 3f31617aacfe5d31b9057fc298b735b60acd6424
+      baas_branch: 27f42f55a7944ed7d8ba9fad1854a4b22714cb8d
   - func: "compile"
     vars:
       target_to_build: ObjectStoreTests
diff --git a/evergreen/config_overrides.json b/evergreen/config_overrides.json
diff --git a/evergreen/install_baas.sh b/evergreen/install_baas.sh
@@ -17,9 +17,9 @@ case $(uname -s) in
     Darwin)
         if [[ "$(uname -m)" == "arm64" ]]; then
             export GOARCH=arm64
-            STITCH_SUPPORT_LIB_URL="https://s3.amazonaws.com/static.realm.io/stitch-support/stitch-support-macos-arm64-6.1.0-rc3-8-gb6e0525.tgz"
-            STITCH_ASSISTED_AGG_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_osx_patch_75b3f1896aaa2e344817795c8bfc5cb6b2f2c310_632211a5d1fe0757f8c416fa_22_09_14_17_38_46/assisted_agg"
-            GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.19.3.darwin-arm64.tar.gz"
+            STITCH_SUPPORT_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-support/macos-arm64/stitch-support-6.1.0-alpha-527-g796351f.tgz"
+            STITCH_ASSISTED_AGG_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_osx_patch_1e7861d9b7462f01ea220fad334f10e00f0f3cca_6513254ad6d80abfffa5fbdc_23_09_26_18_39_06/assisted_agg"
+            GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.21.1.darwin-arm64.tar.gz"
             MONGODB_DOWNLOAD_URL="https://downloads.mongodb.com/osx/mongodb-macos-arm64-enterprise-6.0.0-rc13.tgz"
             MONGOSH_DOWNLOAD_URL="https://downloads.mongodb.com/compass/mongosh-1.5.0-darwin-arm64.zip"
 
@@ -34,21 +34,28 @@ case $(uname -s) in
             export GOMAXPROCS
         else
             export GOARCH=amd64
-            STITCH_SUPPORT_LIB_URL="https://s3.amazonaws.com/static.realm.io/stitch-support/stitch-support-macos-4.4.17-rc1-2-g85de0cc.tgz"
-            STITCH_ASSISTED_AGG_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_osx_patch_75b3f1896aaa2e344817795c8bfc5cb6b2f2c310_632211a5d1fe0757f8c416fa_22_09_14_17_38_46/assisted_agg"
-            GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.19.1.darwin-amd64.tar.gz"
+            STITCH_SUPPORT_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-support/macos-arm64/stitch-support-4.4.17-rc1-2-g85de0cc.tgz"
+            STITCH_ASSISTED_AGG_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_osx_patch_1e7861d9b7462f01ea220fad334f10e00f0f3cca_6513254ad6d80abfffa5fbdc_23_09_26_18_39_06/assisted_agg"
+            GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.21.1.darwin-amd64.tar.gz"
             MONGODB_DOWNLOAD_URL="https://downloads.mongodb.com/osx/mongodb-macos-x86_64-enterprise-5.0.3.tgz"
         fi
 
         NODE_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/node-v14.17.0-darwin-x64.tar.gz"
         JQ_DOWNLOAD_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/jq-1.6-darwin-amd64"
     ;;
     Linux)
-        GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.19.1.linux-amd64.tar.gz"
+        GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.21.1.linux-amd64.tar.gz"
         JQ_DOWNLOAD_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/jq-1.6-linux-amd64"
         NODE_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/node-v14.17.0-linux-x64.tar.gz"
 
-        # Detect what distro/versionf of Linux we are running on to download the right version of MongoDB to download
+        # Only x86_64 Linux machines are supported
+        linux_arch="$(uname -m)"
+        if [[ "${linux_arch}" != "x86_64" ]]; then
+            echo "Error: only x86_64 Linux machines are supported: ${linux_arch}"
+            exit 1
+        fi
+
+        # Detect what distro/version of Linux we are running on to determine the right version of MongoDB to download
         # /etc/os-release covers debian/ubuntu/suse
         if [[ -e /etc/os-release ]]; then
             # Amazon Linux 2 comes back as 'amzn'
@@ -64,49 +71,49 @@ case $(uname -s) in
         case $DISTRO_NAME in
             ubuntu | linuxmint)
                 MONGODB_DOWNLOAD_URL="http://downloads.10gen.com/linux/mongodb-linux-$(uname -m)-enterprise-ubuntu${DISTRO_VERSION_MAJOR}04-5.0.3.tgz"
-                STITCH_ASSISTED_AGG_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_ubuntu2004_x86_64_86b48e3cb2a8d5bbf3d18281c9f42c1835bbb83b_22_11_08_03_08_06/libmongo-ubuntu2004-x86_64.so"
+                STITCH_ASSISTED_AGG_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_ubuntu2004_x86_64_patch_1e7861d9b7462f01ea220fad334f10e00f0f3cca_65135b432fbabe741bd24429_23_09_26_22_29_24/libmongo-ubuntu2004-x86_64.so"
                 STITCH_SUPPORT_LIB_URL="https://s3.amazonaws.com/static.realm.io/stitch-support/stitch-support-ubuntu2004-4.4.17-rc1-2-g85de0cc.tgz"
             ;;
             rhel)
                 case ${DISTRO_VERSION_MAJOR} in
                     7)
                         MONGODB_DOWNLOAD_URL="https://downloads.mongodb.com/linux/mongodb-linux-x86_64-enterprise-rhel70-5.0.3.tgz"
-                        STITCH_ASSISTED_AGG_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_linux_64_86b48e3cb2a8d5bbf3d18281c9f42c1835bbb83b_22_11_08_03_08_06/libmongo.so"
-                        STITCH_SUPPORT_LIB_URL="https://s3.amazonaws.com/static.realm.io/stitch-support/stitch-support-rhel70-4.4.17-rc1-2-g85de0cc.tgz"
+                        STITCH_ASSISTED_AGG_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_linux_64_patch_1e7861d9b7462f01ea220fad334f10e00f0f3cca_65135b432fbabe741bd24429_23_09_26_22_29_24/libmongo.so"
+                        STITCH_SUPPORT_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-support/linux-x64/stitch-support-4.4.17-rc1-2-g85de0cc.tgz"
                     ;;
                     *)
-                        echo "Unsupported version of RHEL ${DISTRO_VERSION}"
+                        echo "Error: unsupported version of RHEL ${DISTRO_VERSION}"
                         exit 1
                     ;;
                 esac
             ;;
             *)
                 if [[ -z "${MONGODB_DOWNLOAD_URL}" ]]; then
-                    echo "Missing MONGODB_DOWNLOAD_URL env variable to download mongodb from."
+                    echo "Error: missing MONGODB_DOWNLOAD_URL env variable to download mongodb from."
                     exit 1
                 fi
                 if [[ -z "${STITCH_ASSISTED_AGG_LIB_PATH}" ]]; then
-                    echo "Missing STITCH_ASSISTED_AGG_LIB_PATH env variable to find assisted agg libmongo.so"
+                    echo "Error: missing STITCH_ASSISTED_AGG_LIB_PATH env variable to find assisted agg libmongo.so"
                     exit 1
                 fi
                 if [[ -z "${STITCH_SUPPORT_LIB_PATH}" ]]; then
-                    echo "Missing STITCH_SUPPORT_LIB_PATH env variable to find the mongo stitch support library"
+                    echo "Error: missing STITCH_SUPPORT_LIB_PATH env variable to find the mongo stitch support library"
                     exit 1
                 fi
             ;;
         esac
     ;;
     *)
         if [[ -z "${MONGODB_DOWNLOAD_URL}" ]]; then
-            echo "Missing MONGODB_DOWNLOAD_URL env variable to download mongodb from."
+            echo "Error: missing MONGODB_DOWNLOAD_URL env variable to download mongodb from."
             exit 1
         fi
         if [[ -z "${STITCH_ASSISTED_AGG_LIB_PATH}" ]]; then
-            echo "Missing STITCH_ASSISTED_AGG_LIB_PATH env variable to find assisted agg libmongo.so"
+            echo "Error: missing STITCH_ASSISTED_AGG_LIB_PATH env variable to find assisted agg libmongo.so"
             exit 1
         fi
         if [[ -z "${STITCH_SUPPORT_LIB_PATH}" ]]; then
-            echo "Missing STITCH_SUPPORT_LIB_PATH env variable to find the mongo stitch support library"
+            echo "Error: missing STITCH_SUPPORT_LIB_PATH env variable to find the mongo stitch support library"
             exit 1
         fi
         exit 1
@@ -453,8 +460,9 @@ echo "Adding fake appid to skip baas server drop optimization"
 # Start the baas server on port *:9090 with the provided config JSON files
 echo "Starting baas app server"
 
+# see config overrides at https://github.com/10gen/baas/blob/master/etc/configs/test_rcore_config.json
 "${WORK_PATH}/baas_server" \
-    --configFile=etc/configs/test_config.json --configFile="${BASE_PATH}/config_overrides.json" > "${BAAS_SERVER_LOG}" 2>&1 &
+    --configFile=etc/configs/test_config.json --configFile=etc/configs/test_rcore_config.json > "${BAAS_SERVER_LOG}" 2>&1 &
 echo $! > "${BAAS_PID_FILE}"
 
 WAIT_BAAS_OPTS=()
@@ -472,7 +480,7 @@ ${CURL} 'http://localhost:9090/api/admin/v3.0/auth/providers/local-userpass/logi
   --silent \
   --fail \
   --output /dev/null \
-  --data-raw '{"username":"unique_user@domain.com","password":"password"}'
+  --data '{"username":"unique_user@domain.com","password":"password"}'
 
 "${MONGO_BINARIES_DIR}/bin/${MONGOSH}"  --quiet mongodb://localhost:26000/auth "${BASE_PATH}/add_admin_roles.js"
 
@@ -483,4 +491,4 @@ echo "---------------------------------------------"
 echo "Baas server ready"
 echo "---------------------------------------------"
 wait
-popd > /dev/null  # baas
+popd > /dev/null  # baas
diff --git a/src/realm/sync/client.cpp b/src/realm/sync/client.cpp
@@ -1137,6 +1137,9 @@ SessionWrapper::SessionWrapper(ClientImpl& client, DBRef db, std::shared_ptr<Sub
     REALM_ASSERT(m_db);
     REALM_ASSERT(m_db->get_replication());
     REALM_ASSERT(dynamic_cast<ClientReplication*>(m_db->get_replication()));
+    if (m_client_reset_config) {
+        m_session_reason = SessionReason::ClientReset;
+    }
 
     update_subscription_version_info();
 }
diff --git a/test/object-store/sync/flx_migration.cpp b/test/object-store/sync/flx_migration.cpp
@@ -441,8 +441,12 @@ TEST_CASE("Test client migration and rollback with recovery", "[sync][flx][flx m
     //  Migrate back to FLX - and keep the realm session open
     trigger_server_migration(session.app_session(), MigrateToFLX, logger_ptr);
 
-    REQUIRE(!wait_for_upload(*outer_realm));
-    REQUIRE(!wait_for_download(*outer_realm));
+    // wait for the subscription store to initialize after downloading
+    timed_wait_for(
+        [&outer_realm]() {
+            return outer_realm->sync_session() && outer_realm->sync_session()->get_flx_subscription_store();
+        },
+        std::chrono::seconds(180));
 
     // Verify data has been sync'ed and there is only 1 subscription for the Object table
     {
diff --git a/test/object-store/sync/flx_sync.cpp b/test/object-store/sync/flx_sync.cpp
diff --git a/test/object-store/util/sync/baas_admin_api.cpp b/test/object-store/util/sync/baas_admin_api.cpp

Original file line number	Diff line number	Diff line change
`@@ -1137,6 +1137,9 @@ SessionWrapper::SessionWrapper(ClientImpl& client, DBRef db, std::shared_ptr<Sub`
`1137`	`1137`	`REALM_ASSERT(m_db);`
`1138`	`1138`	`REALM_ASSERT(m_db->get_replication());`
`1139`	`1139`	`REALM_ASSERT(dynamic_cast<ClientReplication*>(m_db->get_replication()));`
	`1140`	`+ if (m_client_reset_config) {`
	`1141`	`+ m_session_reason = SessionReason::ClientReset;`
	`1142`	`+ }`
`1140`	`1143`
`1141`	`1144`	`update_subscription_version_info();`
`1142`	`1145`	`}`