Page MenuHomePhabricator
Files F3570630

D13213.id43955.diff
No OneTemporary
Actions

D13213.id43955.diff
View Options

diff --git a/keyserver/src/database/migration-config.js b/keyserver/src/database/migration-config.js
--- a/keyserver/src/database/migration-config.js
+++ b/keyserver/src/database/migration-config.js
@@ -1058,6 +1058,17 @@
);
const newDatabaseVersion: number = Math.max(...versions);
+const wrapInTransactionAndBlockRequestsVersions = migrations
+ .filter(
+ migration =>
+ !migration.migrationType ||
+ migration.migrationType === 'wrap_in_transaction_and_block_requests',
+ )
+ .map(migration => migration.version);
+const latestWrapInTransactionAndBlockRequestsVersion: number = Math.max(
+ ...wrapInTransactionAndBlockRequestsVersions,
+);
+
async function writeJSONToFile(data: any, filePath: string): Promise<void> {
console.warn(`updating ${filePath} to ${JSON.stringify(data)}`);
const fileHandle = await fs.promises.open(filePath, 'w');
@@ -1190,6 +1201,7 @@
export {
migrations,
newDatabaseVersion,
+ latestWrapInTransactionAndBlockRequestsVersion,
createOlmAccounts,
saveNewOlmAccounts,
};
diff --git a/keyserver/src/keyserver.js b/keyserver/src/keyserver.js
--- a/keyserver/src/keyserver.js
+++ b/keyserver/src/keyserver.js
@@ -17,7 +17,10 @@
import { identityDeviceTypes } from 'lib/types/identity-service-types.js';
import { isDev } from 'lib/utils/dev-utils.js';
import { ignorePromiseRejections } from 'lib/utils/promises.js';
+import sleep from 'lib/utils/sleep.js';
+import { fetchDBVersion } from './database/db-version.js';
+import { latestWrapInTransactionAndBlockRequestsVersion } from './database/migration-config.js';
import { migrate } from './database/migrations.js';
import { jsonEndpoints } from './endpoints.js';
import { logEndpointMetrics } from './middleware/endpoint-profiling.js';
@@ -95,6 +98,16 @@
const areEndpointMetricsEnabled =
process.env.KEYSERVER_ENDPOINT_METRICS_ENABLED;
+ const listenAddress = (() => {
+ if (process.env.COMM_LISTEN_ADDR) {
+ return process.env.COMM_LISTEN_ADDR;
+ } else if (process.env.NODE_ENV === 'development') {
+ return undefined;
+ } else {
+ return 'localhost';
+ }
+ })();
+
if (cluster.isMaster) {
if (isPrimaryNode) {
const didMigrationsSucceed: boolean = await migrate();
@@ -192,6 +205,17 @@
res.send('OK');
});
+ server.listen(parseInt(process.env.PORT, 10) || 3000, listenAddress);
+
+ if (isSecondaryNode) {
+ let dbVersion;
+ do {
+ await sleep(5000);
+
+ dbVersion = await fetchDBVersion();
+ } while (dbVersion < latestWrapInTransactionAndBlockRequestsVersion);
+ }
+
// Note - the order of router declarations matters. On prod we have
// keyserverBaseRoutePath configured to '/', which means it's a catch-all.
// If we call server.use on keyserverRouter first, it will catch all
@@ -316,17 +340,5 @@
res.redirect(newURL);
});
}
-
- const listenAddress = (() => {
- if (process.env.COMM_LISTEN_ADDR) {
- return process.env.COMM_LISTEN_ADDR;
- } else if (process.env.NODE_ENV === 'development') {
- return undefined;
- } else {
- return 'localhost';
- }
- })();
-
- server.listen(parseInt(process.env.PORT, 10) || 3000, listenAddress);
}
})();

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 29, 5:51 AM (2 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2730878
Default Alt Text
D13213.id43955.diff (3 KB)

Event Timeline