From 7dce79211ed45181399f625ac7e4d65ac979f853 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 5 Jan 2021 09:38:18 +0200 Subject: [PATCH 01/10] APPS-706 increase activeMQ memory because sometimes it stops: Transport (tcp://activemq:61616) failed, not attempting to automatically reconnect --- scripts/dockerLimitMemory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 71ae1f6095..7d7fe9cf64 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -8,7 +8,7 @@ docker stats --no-stream docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') +docker update --memory=700Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') From 02d0ad8bd8a4df6ddee9b83b7d1f5bf290861c30 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 5 Jan 2021 11:30:20 +0200 Subject: [PATCH 02/10] APPS-706 increase activeMQ memory because sometimes it stops: Transport (tcp://activemq:61616) failed, not attempting to automatically reconnect --- scripts/dockerLimitMemory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 7d7fe9cf64..a7d2c3559e 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -8,7 +8,7 @@ docker stats --no-stream docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=700Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') +docker update --memory=800Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') From 0efafba553dd861f63f72b4302bafd9bd3bb20f1 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 5 Jan 2021 14:16:21 +0200 Subject: [PATCH 03/10] APPS-706 increase activeMQ memory because sometimes it stops: Transport (tcp://activemq:61616) failed, not attempting to automatically reconnect --- scripts/dockerLimitMemory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index a7d2c3559e..61fced2bd0 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -8,7 +8,7 @@ docker stats --no-stream docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=800Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') +docker update --memory=850Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') From 71d00c24f4ec5dd5868b9e92669176f399f35e50 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 5 Jan 2021 15:48:32 +0200 Subject: [PATCH 04/10] APPS-706 increase activeMQ memory because sometimes it stops: Transport (tcp://activemq:61616) failed, not attempting to automatically reconnect --- scripts/dockerLimitMemory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 61fced2bd0..03e586027f 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -8,7 +8,7 @@ docker stats --no-stream docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=850Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') +docker update --memory=900Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') From b74344accf3a9f49eb08fda105e23ca6f54dcac1 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 6 Jan 2021 10:06:26 +0200 Subject: [PATCH 05/10] APPS-706 increase activeMQ memory because sometimes it stops: Transport (tcp://activemq:61616) failed, not attempting to automatically reconnect --- scripts/dockerLimitMemory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 03e586027f..11ea12fc1b 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -8,7 +8,7 @@ docker stats --no-stream docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=900Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') +docker update --memory=950Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') From c94e7750fd66126d017b0176528f7b50b6ba50b9 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 6 Jan 2021 12:38:50 +0200 Subject: [PATCH 06/10] APPS-706 limit containers memory directly in docker-compose --- scripts/dockerLimitMemory.sh | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 11ea12fc1b..d0867177bc 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -1,29 +1,15 @@ #!/usr/bin/env bash set -x -# Display containers resources usage before limitation -docker stats --no-stream - -#limit memory used by each container -docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') -docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') -docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=950Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') -docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') - -shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') -if [ -n "$shareContainerId" ]; then - docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId - docker stop $(docker ps -a | grep '_transform-router_' | awk '{print $1}') - docker stop $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') - else - docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-router_' | awk '{print $1}') - docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') -fi - #stop not needed containers docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') docker stop $(docker ps -a | grep '_sync-service_' | awk '{print $1}') -# Display containers resources usage after limitation +shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') +if [ -n "$shareContainerId" ]; then + docker stop $(docker ps -a | grep '_transform-router_' | awk '{print $1}') + docker stop $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') +fi + +# Display containers resources usage docker stats --no-stream From d7a916dea2d0f0367911c424a5f5623cc0ded43c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 7 Jan 2021 11:19:55 +0200 Subject: [PATCH 07/10] Revert "APPS-706 limit containers memory directly in docker-compose" This reverts commit c94e7750 --- scripts/dockerLimitMemory.sh | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index d0867177bc..11ea12fc1b 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -1,15 +1,29 @@ #!/usr/bin/env bash set -x +# Display containers resources usage before limitation +docker stats --no-stream + +#limit memory used by each container +docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') +docker update --memory=950Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') +docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') + +shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') +if [ -n "$shareContainerId" ]; then + docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId + docker stop $(docker ps -a | grep '_transform-router_' | awk '{print $1}') + docker stop $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') + else + docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-router_' | awk '{print $1}') + docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') +fi + #stop not needed containers docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') docker stop $(docker ps -a | grep '_sync-service_' | awk '{print $1}') -shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') -if [ -n "$shareContainerId" ]; then - docker stop $(docker ps -a | grep '_transform-router_' | awk '{print $1}') - docker stop $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') -fi - -# Display containers resources usage +# Display containers resources usage after limitation docker stats --no-stream From 21e0bdd6a648b7141361e2d1fd9c1063df29d103 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 7 Jan 2021 11:21:05 +0200 Subject: [PATCH 08/10] increase activeMQ memory limit and reduce alfresco's one --- scripts/dockerLimitMemory.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 11ea12fc1b..47a75d58af 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -5,11 +5,10 @@ set -x docker stats --no-stream #limit memory used by each container -docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=950Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') -docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') +docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') if [ -n "$shareContainerId" ]; then From e6d200bab0eb26d874d31321ac6f9ed62b135a02 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 7 Jan 2021 14:06:54 +0200 Subject: [PATCH 09/10] Revert "increase activeMQ memory limit and reduce alfresco's one" This reverts commit 21e0bdd6 --- scripts/dockerLimitMemory.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 47a75d58af..11ea12fc1b 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -5,10 +5,11 @@ set -x docker stats --no-stream #limit memory used by each container -docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') +docker update --memory=950Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') +docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') if [ -n "$shareContainerId" ]; then From 3820250439a74285e78b086f79dacf49dbacedca Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 7 Jan 2021 14:07:07 +0200 Subject: [PATCH 10/10] Revert "Revert "APPS-706 limit containers memory directly in docker-compose"" This reverts commit d7a916de --- scripts/dockerLimitMemory.sh | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 11ea12fc1b..d0867177bc 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -1,29 +1,15 @@ #!/usr/bin/env bash set -x -# Display containers resources usage before limitation -docker stats --no-stream - -#limit memory used by each container -docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') -docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') -docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=950Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') -docker update --memory=1Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-core-aio_' | awk '{print $1}') - -shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') -if [ -n "$shareContainerId" ]; then - docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId - docker stop $(docker ps -a | grep '_transform-router_' | awk '{print $1}') - docker stop $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') - else - docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-router_' | awk '{print $1}') - docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') -fi - #stop not needed containers docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') docker stop $(docker ps -a | grep '_sync-service_' | awk '{print $1}') -# Display containers resources usage after limitation +shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') +if [ -n "$shareContainerId" ]; then + docker stop $(docker ps -a | grep '_transform-router_' | awk '{print $1}') + docker stop $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') +fi + +# Display containers resources usage docker stats --no-stream