Skip to content

Commit 4159b89

Browse files
authored
Platform stability: (#1645)
* increased number of postgres connections * openNode returns nodeId * wait a bit longer for fetching the files
1 parent f801fdd commit 4159b89

File tree

6 files changed

+28
-11
lines changed

6 files changed

+28
-11
lines changed

services/web/server/src/simcore_service_webserver/config/server-docker-dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ db:
3434
password: ${POSTGRES_PASSWORD}
3535
host: ${POSTGRES_HOST}
3636
port: ${POSTGRES_PORT}
37-
minsize: 4
38-
maxsize: 4
37+
minsize: 10
38+
maxsize: 40
3939
resource_manager:
4040
enabled: True
4141
resource_deletion_timeout_seconds: ${WEBSERVER_RESOURCES_DELETION_TIMEOUT_SECONDS}

services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ db:
3232
host: ${POSTGRES_HOST}
3333
port: ${POSTGRES_PORT}
3434
minsize: 10
35-
maxsize: 15
35+
maxsize: 40
3636
resource_manager:
3737
enabled: True
3838
resource_deletion_timeout_seconds: ${WEBSERVER_RESOURCES_DELETION_TIMEOUT_SECONDS}

tests/e2e/tutorials/mattward.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ const utils = require('../utils/utils');
44
const tutorialBase = require('./tutorialBase');
55

66
const args = process.argv.slice(2);
7-
const { url, user, pass, newUser, enableDemoMode } = utils.parseCommandLineArguments(args)
7+
const {
8+
url,
9+
user,
10+
pass,
11+
newUser,
12+
enableDemoMode
13+
} = utils.parseCommandLineArguments(args)
814

915
const templateName = "Mattward";
1016

tests/e2e/tutorials/sleepers.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ const utils = require('../utils/utils');
44
const tutorialBase = require('./tutorialBase');
55

66
const args = process.argv.slice(2);
7-
const { url, user, pass, newUser, enableDemoMode } = utils.parseCommandLineArguments(args)
7+
const {
8+
url,
9+
user,
10+
pass,
11+
newUser,
12+
enableDemoMode
13+
} = utils.parseCommandLineArguments(args)
814

915
const templateName = "Sleepers";
1016

tests/e2e/tutorials/tutorialBase.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ class TutorialBase {
162162
}
163163

164164
async openNodeFiles(nodePosInTree = 0) {
165-
await auto.openNode(this.__page, nodePosInTree);
166-
this.__responsesQueue.addResponseListener("storage/locations/0/files/metadata?uuid_filter=");
165+
const nodeId = await auto.openNode(this.__page, nodePosInTree);
166+
this.__responsesQueue.addResponseListener("storage/locations/0/files/metadata?uuid_filter=" + nodeId);
167167
await auto.openNodeFiles(this.__page);
168168
try {
169-
await this.__responsesQueue.waitUntilResponse("storage/locations/0/files/metadata?uuid_filter=");
169+
await this.__responsesQueue.waitUntilResponse("storage/locations/0/files/metadata?uuid_filter=" + nodeId);
170170
}
171171
catch(err) {
172172
console.error(err);

tests/e2e/utils/auto.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,15 @@ async function openNode(page, pos) {
232232
console.log("children", children);
233233
if (children.length < pos + 1) {
234234
console.log("Node tree items not found");
235-
return;
235+
return null;
236236
}
237-
const childId = '[osparc-test-id="' + children[pos] + '"]';
237+
const nodeWidgetId = children[pos];
238+
const childId = '[osparc-test-id="' + nodeWidgetId + '"]';
238239
await utils.waitAndClick(page, childId);
239240
await utils.waitAndClick(page, '[osparc-test-id="openServiceBtn"]');
241+
242+
const nodeId = nodeWidgetId.replace("nodeTreeItem_", "");
243+
return nodeId;
240244
}
241245

242246
async function openLastNode(page) {
@@ -272,8 +276,9 @@ async function checkDataProducedByNode(page, nFiles = 1) {
272276
console.log("checking Data produced by Node. Expecting", nFiles, "file(s)");
273277
const tries = 3;
274278
let children = [];
279+
const minTime = 1000; // wait a bit longer for fetching the files
275280
for (let i = 0; i < tries && children.length === 0; i++) {
276-
await page.waitFor(1000); // it takes some time to build the tree
281+
await page.waitFor(minTime * (i + 1));
277282
await page.waitForSelector('[osparc-test-id="fileTreeItem_NodeFiles"]');
278283
children = await utils.getFileTreeItemIDs(page, "NodeFiles");
279284
console.log(i + 1, 'try: ', children);

0 commit comments

Comments
 (0)