Merge pull request #8171 from romayalon/romy-5.16-backport

5.16 Backport

Author: nimrod-becker

config.js

@@ -908,6 +908,12 @@ config.TIERING_TTL_MS = 30 * 60 * 1000; // 30 minutes
 config.AWS_SDK_VERSION_3_ENABLED = true;
 config.DEFAULT_REGION = 'us-east-1';
 
+/////////////////////////
+///  VACCUM ANALYZER  ///
+/////////////////////////
+
+config.VACCUM_ANALYZER_INTERVAL = 86400000;
+
 /////////////////////
 //                 //
 //    OVERRIDES    //

src/cmd/nsfs.js

@@ -4,12 +4,12 @@
 
 require('../util/dotenv').load();
 require('aws-sdk/lib/maintenance_mode_message').suppress = true;
-const { cluster } = require('../util/fork_utils');
 
 const dbg = require('../util/debug_module')(__filename);
 if (!dbg.get_process_name()) dbg.set_process_name('nsfs');
 dbg.original_console();
 
+// DO NOT PUT NEW REQUIREMENTS BEFORE SETTING process.env.NC_NSFS_NO_DB_ENV = 'true' 
 // NC nsfs deployments specifying process.env.LOCAL_MD_SERVER=true deployed together with a db
 // when a system_store object is initialized VaccumAnalyzer is being called once a day.
 // when NC nsfs deployed without db we would like to avoid running VaccumAnalyzer in any flow there is
@@ -33,6 +33,7 @@ const nb_native = require('../util/nb_native');
 //const schema_utils = require('../util/schema_utils');
 const RpcError = require('../rpc/rpc_error');
 const ObjectSDK = require('../sdk/object_sdk');
+const { cluster } = require('../util/fork_utils');
 const NamespaceFS = require('../sdk/namespace_fs');
 const BucketSpaceSimpleFS = require('../sdk/bucketspace_simple_fs');
 const BucketSpaceFS = require('../sdk/bucketspace_fs');

src/test/unit_tests/nc_coretest.js

@@ -142,7 +142,10 @@ async function config_dir_setup() {
     await fs.promises.writeFile(CONFIG_FILE_PATH, JSON.stringify({
         ALLOW_HTTP: true,
         OBJECT_SDK_BUCKET_CACHE_EXPIRY_MS: 1,
-        NC_RELOAD_CONFIG_INTERVAL: 1
+        NC_RELOAD_CONFIG_INTERVAL: 1,
+        // DO NOT CHANGE - setting VACCUM_ANALYZER_INTERVAL=1 needed for failing the tests
+        // in case where vaccumAnalyzer is being called before setting process.env.NC_NSFS_NO_DB_ENV = 'true' on nsfs.js
+        VACCUM_ANALYZER_INTERVAL: 1
     }));
     await fs.promises.mkdir(FIRST_BUCKET_PATH, { recursive: true });
 

src/util/postgres_client.js

@@ -610,7 +610,7 @@ class PostgresTable {
         if (!process.env.CORETEST && !process.env.NC_NSFS_NO_DB_ENV) {
             // Run once a day
             // TODO: Configure from PostgreSQL
-            setInterval(this.vacuumAndAnalyze, 86400000, this).unref();
+            setInterval(this.vacuumAndAnalyze, config.VACCUM_ANALYZER_INTERVAL, this).unref();
         }
     }
 
@@ -705,7 +705,6 @@ class PostgresTable {
             dbg.log0('vacuumAndAnalyze finished', context.name);
         } catch (err) {
             dbg.error('vacuumAndAnalyze failed', err);
-            throw err;
         }
     }