Merge remote-tracking branch 'origin/staging' into development

database/elastic_set_tenant_settings.js

@@ -0,0 +1,98 @@
+import { config } from 'api/config';
+import { tenants } from 'api/tenants/tenantContext';
+import { DB } from 'api/odm';
+import { IndexError } from 'api/search/entitiesIndex';
+
+import { legacyLogger } from '../app/api/log';
+
+const getIndexUrl = () => {
+  const elasticUrl = config.elasticsearch_nodes[0];
+  return `${elasticUrl}/${tenants.current().indexName}`;
+};
+
+const headers = {
+  Accept: 'application/json',
+  'Content-Type': 'application/json',
+};
+
+const setIndexSettings = async numberOfReplicas => {
+  const body = JSON.stringify({
+    index: {
+      number_of_replicas: numberOfReplicas,
+    },
+  });
+
+  const result = await fetch(`${getIndexUrl()}/_settings`, {
+    method: 'PUT',
+    headers,
+    body,
+  });
+
+  return result;
+};
+
+const setTenantSettings = async () => {
+  const tenantReplicas = tenants.current().featureFlags?.esReplicas || 0;
+  process.stdout.write(`Setting ${tenantReplicas} ES Replicas...`);
+  const result = setIndexSettings(tenantReplicas);
+  process.stdout.write(' [done]\r\n');
+  return result;
+};
+
+const endScriptProcedures = async () =>
+  new Promise((resolve, reject) => {
+    (async () => {
+      try {
+        await DB.disconnect();
+        resolve();
+      } catch (err) {
+        reject(err);
+      }
+    })();
+  });
+
+const processErrors = async err => {
+  if (err instanceof IndexError) {
+    process.stdout.write('\r\nWarning! Errors found during operation.\r\n');
+  } else {
+    const errorMsg =
+      err instanceof Error
+        ? `${err.message}\r\n${JSON.stringify(err, null, ' ')}`
+        : JSON.stringify(err, null, ' ');
+    legacyLogger.error(`Uncaught error.\r\n${errorMsg}\r\nWill exit with (1)\r\n`);
+    await endScriptProcedures();
+    throw err;
+  }
+};
+
+process.on('unhandledRejection', error => {
+  throw error;
+});
+
+let dbAuth = {};
+
+if (process.env.DBUSER) {
+  dbAuth = {
+    auth: { authSource: 'admin' },
+    user: process.env.DBUSER,
+    pass: process.env.DBPASS,
+  };
+}
+
+DB.connect(config.DBHOST, dbAuth).then(async () => {
+  const start = Date.now();
+  await tenants.setupTenants();
+
+  await tenants.run(async () => {
+    process.stdout.write(`Setting ES index settings for ${tenants.current().indexName}...\r\n`);
+    try {
+      await setTenantSettings();
+    } catch (err) {
+      processErrors(err);
+    }
+    await endScriptProcedures();
+  }, process.env.UWAZI_TENANT || config.defaultTenant.name);
+
+  const end = Date.now();
+  process.stdout.write(`Done, took ${(end - start) / 1000} seconds\n`);
+});

database/reindex_elastic.js

@@ -13,7 +13,7 @@ import { legacyLogger } from '../app/api/log';
 
 const getIndexUrl = () => {
   const elasticUrl = config.elasticsearch_nodes[0];
-  return `${elasticUrl}/${config.defaultTenant.indexName}`;
+  return `${elasticUrl}/${tenants.current().indexName}`;
 };
 
 const headers = {
@@ -90,7 +90,7 @@ const indexEntities = async () => {
 
 /*eslint-disable max-statements*/
 const prepareIndex = async () => {
-  process.stdout.write(`Deleting index ${config.defaultTenant.indexName}...`);
+  process.stdout.write(`Deleting index ${tenants.current().indexName}...`);
   try {
     await fetch(getIndexUrl(), { method: 'delete' });
   } catch (err) {
@@ -104,7 +104,7 @@ const prepareIndex = async () => {
   }
   process.stdout.write(' [done]\n');
 
-  process.stdout.write(`Creating index ${config.defaultTenant.indexName}...\r\n`);
+  process.stdout.write(`Creating index ${tenants.current().indexName}...\r\n`);
   process.stdout.write(' - Base properties mapping\r\n');
 
   await fetch(getIndexUrl(), {
@@ -168,6 +168,7 @@ if (process.env.DBUSER) {
 
 DB.connect(config.DBHOST, dbAuth).then(async () => {
   const start = Date.now();
+  await tenants.setupTenants();
 
   await tenants.run(async () => {
     try {
@@ -179,7 +180,7 @@ DB.connect(config.DBHOST, dbAuth).then(async () => {
       await processErrors(err);
     }
     await endScriptProcedures();
-  });
+  }, process.env.UWAZI_TENANT || config.defaultTenant.name);
 
   const end = Date.now();
   process.stdout.write(`Done, took ${(end - start) / 1000} seconds\n`);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uwazi",
-  "version": "1.202.0-rc11",
+  "version": "1.202.0-rc12",
   "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
   "keywords": [
     "react"
@@ -45,6 +45,7 @@
     "hot-inspect": "export HOT=true; export BABEL_ENV=debug; yarn run watch-types & yarn dev-server --inspect & yarn run webpack-server",
     "hot-debug": "export HOT=true; export BABEL_ENV=debug; node --no-experimental-fetch --inspect=9229 server.js & yarn run webpack-server",
     "reindex": "node scripts/run.js ../database/reindex_elastic.js",
+    "elastic-set-tenant-settings": "node scripts/run.js ../database/elastic_set_tenant_settings.js",
     "import-csv": "node --no-experimental-fetch scripts/run.js ../database/import_csv.js",
     "blank-state": "node --no-experimental-fetch scripts/bash.js ./database/blank_state.sh",
     "admin-user": "node --no-experimental-fetch scripts/bash.js ./database/admin_user.sh",