From 387bd7f1b870b37cfafc4d93c2151f882491575c Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 20 Jul 2021 09:43:17 +0000 Subject: [PATCH 1/4] 3.6.1.2 branch commit --- docs/source/conf.py | 4 ++-- patches/3.6.0.0/Dockerfile | 28 ++++++++++++++++++++++++++++ patches/3.6.0.0/build.sh | 4 ++++ patches/3.6.0.0/image.conf | 3 +++ patches/3.6.0.0/vnest_patch | 7 +++++++ patches/3.6.1.2/Dockerfile | 28 ++++++++++++++++++++++++++++ patches/3.6.1.2/build.sh | 4 ++++ patches/3.6.1.2/image.conf | 3 +++ patches/3.6.1.2/vnest_patch | 7 +++++++ release.conf | 5 +++++ ui/etc/config.yml | 6 +++--- ui/etc/release.conf | 10 +++++----- ui/run.sh | 8 ++++++++ ui/setup.py | 2 +- 14 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 patches/3.6.0.0/Dockerfile create mode 100755 patches/3.6.0.0/build.sh create mode 100644 patches/3.6.0.0/image.conf create mode 100755 patches/3.6.0.0/vnest_patch create mode 100644 patches/3.6.1.2/Dockerfile create mode 100755 patches/3.6.1.2/build.sh create mode 100644 patches/3.6.1.2/image.conf create mode 100755 patches/3.6.1.2/vnest_patch diff --git a/docs/source/conf.py b/docs/source/conf.py index 96f53d5f..957a05fe 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = u'3.5' +version = u'3.6' # The full version, including alpha/beta/rc tags. -release = u'3.5.1.2' +release = u'3.6.1.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/patches/3.6.0.0/Dockerfile b/patches/3.6.0.0/Dockerfile new file mode 100644 index 00000000..be6ea2fe --- /dev/null +++ b/patches/3.6.0.0/Dockerfile @@ -0,0 +1,28 @@ +# Fixes to the default 3.6.1.2 reduced image. + +# Build on object-reduced image (GA release) +FROM emcvipr/object:3.6.1.2-127130.8f7f1a4b665-reduced + +# Fix disk partitioning script +RUN sed -i '/VMware/ s/$/ \&\& [ ! -e \/data\/is_community_edition ]/' /opt/storageos/bin/storageserver-partition-config.sh \ + && /usr/bin/chmod +x /opt/storageos/bin/storageserver-partition-config.sh + +# Set VNest useSeperateThreadPools to True +#RUN f=/opt/storageos/conf/vnest-common-conf.xml; grep -q "object.UseSeparateThreadPools" $f || sed -i '/properties id="serviceProperties"/a \ \ \ \ \ \ \ \ true' $f +RUN f=/opt/storageos/conf/vnest-common-conf.xml; sed -i '547 i \ \ \ \ \ \ \ \ true' $f + +# Allow allocation of different blocks of a chunk to be stored on the same partition +#RUN f=/opt/storageos/conf/ssm-cf-conf.xml; grep -q '' $f || sed -i 's###g' /opt/storageos/conf/ssm-cf-conf.xml $f + +## Increase memory for transformsvc +#RUN sed -i s/Xmx128m/Xmx512m/ /opt/storageos/bin/transformsvc + +## Set memory for objcontrolsvc +#RUN sed -i s/Xmx96m/Xmx256m/ /opt/storageos/bin/objcontrolsvc + +# Set georeceiver's initialBufferNumOnHeap to something smaller for CE +#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q 'name="initialBufferNumOnHeap" value="5"' $f || sed -i 's/name="initialBufferNumOnHeap" value="60"/name="initialBufferNumOnHeap" value="5"/' $f +#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q '10' $f || sed -i 's#80#10#g' $f + +# Configure CM Object properties: Disable minimum storage device count +#RUN f=/opt/storageos/conf/cm.object.properties; grep -q 'MustHaveEnoughResources=false' $f || sed -i 's/MustHaveEnoughResources=true/MustHaveEnoughResources=false/' $f diff --git a/patches/3.6.0.0/build.sh b/patches/3.6.0.0/build.sh new file mode 100755 index 00000000..8bfdd7b9 --- /dev/null +++ b/patches/3.6.0.0/build.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +source image.conf + +docker build -t "${IMAGE_REPO}:${IMAGE_VERSION}" . diff --git a/patches/3.6.0.0/image.conf b/patches/3.6.0.0/image.conf new file mode 100644 index 00000000..5bf7caee --- /dev/null +++ b/patches/3.6.0.0/image.conf @@ -0,0 +1,3 @@ +BASE_IMAGE="emcvipr/object:3.6.1.2-127130.8f7f1a4b665-reduced" +IMAGE_REPO="emccorp/ecs-software-3.6.0" +IMAGE_VERSION="3.6.1.2" diff --git a/patches/3.6.0.0/vnest_patch b/patches/3.6.0.0/vnest_patch new file mode 100755 index 00000000..ce6b1383 --- /dev/null +++ b/patches/3.6.0.0/vnest_patch @@ -0,0 +1,7 @@ +echo "ECS Vnest patching" >> /tmp/vnest-patch.out +sudo docker exec -i ecs-storageos bash <true' /opt/storageos/conf/vnest-common-conf.xml +sed -n 547p /opt/storageos/conf/vnest-common-conf.xml +EOF +sleep 3 +sudo kill `pidof vnest` diff --git a/patches/3.6.1.2/Dockerfile b/patches/3.6.1.2/Dockerfile new file mode 100644 index 00000000..be6ea2fe --- /dev/null +++ b/patches/3.6.1.2/Dockerfile @@ -0,0 +1,28 @@ +# Fixes to the default 3.6.1.2 reduced image. + +# Build on object-reduced image (GA release) +FROM emcvipr/object:3.6.1.2-127130.8f7f1a4b665-reduced + +# Fix disk partitioning script +RUN sed -i '/VMware/ s/$/ \&\& [ ! -e \/data\/is_community_edition ]/' /opt/storageos/bin/storageserver-partition-config.sh \ + && /usr/bin/chmod +x /opt/storageos/bin/storageserver-partition-config.sh + +# Set VNest useSeperateThreadPools to True +#RUN f=/opt/storageos/conf/vnest-common-conf.xml; grep -q "object.UseSeparateThreadPools" $f || sed -i '/properties id="serviceProperties"/a \ \ \ \ \ \ \ \ true' $f +RUN f=/opt/storageos/conf/vnest-common-conf.xml; sed -i '547 i \ \ \ \ \ \ \ \ true' $f + +# Allow allocation of different blocks of a chunk to be stored on the same partition +#RUN f=/opt/storageos/conf/ssm-cf-conf.xml; grep -q '' $f || sed -i 's###g' /opt/storageos/conf/ssm-cf-conf.xml $f + +## Increase memory for transformsvc +#RUN sed -i s/Xmx128m/Xmx512m/ /opt/storageos/bin/transformsvc + +## Set memory for objcontrolsvc +#RUN sed -i s/Xmx96m/Xmx256m/ /opt/storageos/bin/objcontrolsvc + +# Set georeceiver's initialBufferNumOnHeap to something smaller for CE +#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q 'name="initialBufferNumOnHeap" value="5"' $f || sed -i 's/name="initialBufferNumOnHeap" value="60"/name="initialBufferNumOnHeap" value="5"/' $f +#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q '10' $f || sed -i 's#80#10#g' $f + +# Configure CM Object properties: Disable minimum storage device count +#RUN f=/opt/storageos/conf/cm.object.properties; grep -q 'MustHaveEnoughResources=false' $f || sed -i 's/MustHaveEnoughResources=true/MustHaveEnoughResources=false/' $f diff --git a/patches/3.6.1.2/build.sh b/patches/3.6.1.2/build.sh new file mode 100755 index 00000000..8bfdd7b9 --- /dev/null +++ b/patches/3.6.1.2/build.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +source image.conf + +docker build -t "${IMAGE_REPO}:${IMAGE_VERSION}" . diff --git a/patches/3.6.1.2/image.conf b/patches/3.6.1.2/image.conf new file mode 100644 index 00000000..5bf7caee --- /dev/null +++ b/patches/3.6.1.2/image.conf @@ -0,0 +1,3 @@ +BASE_IMAGE="emcvipr/object:3.6.1.2-127130.8f7f1a4b665-reduced" +IMAGE_REPO="emccorp/ecs-software-3.6.0" +IMAGE_VERSION="3.6.1.2" diff --git a/patches/3.6.1.2/vnest_patch b/patches/3.6.1.2/vnest_patch new file mode 100755 index 00000000..ce6b1383 --- /dev/null +++ b/patches/3.6.1.2/vnest_patch @@ -0,0 +1,7 @@ +echo "ECS Vnest patching" >> /tmp/vnest-patch.out +sudo docker exec -i ecs-storageos bash <true' /opt/storageos/conf/vnest-common-conf.xml +sed -n 547p /opt/storageos/conf/vnest-common-conf.xml +EOF +sleep 3 +sudo kill `pidof vnest` diff --git a/release.conf b/release.conf index 77f19df8..559ea589 100644 --- a/release.conf +++ b/release.conf @@ -11,6 +11,11 @@ # DO NOT specify an alternate registry here. Use the -r argument to # bootstrap.sh for that. # +### Older versions ( 3.6 ) +# release_artifact="emccorp/ecs-software-3.6.0" +# release_tag="3.6.1.2" +# release_tag="3.6.1.2" +# ### Older versions ( 3.5 ) # release_artifact="emccorp/ecs-software-3.5.0" # release_tag="3.5.1.2" diff --git a/ui/etc/config.yml b/ui/etc/config.yml index ef47ba96..a07fc3f5 100644 --- a/ui/etc/config.yml +++ b/ui/etc/config.yml @@ -13,7 +13,7 @@ --- ui: name: ECS Community Edition Install Node - version: 2.11.0r + version: 2.9.1-r-2 host_root_dir: /opt/emc/ecs-install state_file: /opt/state.yml deploy_file: /opt/deploy.yml @@ -32,9 +32,9 @@ ui: ffx_sem: /opt/ffx.sem product: name: ECS - version: 3.5.1.2 + version: 3.6.1.2 vendor: Dell EMC flavor: Community Edition slogan: Free and Frictionless license_file: /usr/local/src/license.txt - common_name: "emccorp/ecs-software:latest" + common_name: "emccorp/ecs-software:3.6.0" diff --git a/ui/etc/release.conf b/ui/etc/release.conf index 21294836..5a5d2380 100644 --- a/ui/etc/release.conf +++ b/ui/etc/release.conf @@ -8,10 +8,10 @@ # it is provided by or on behalf of EMC. release_name="ECS Community Edition" -release_version="3.5.1.2" +release_version="3.6.1.2" release_product="ECS Software" -release_artifact="emccorp/ecs-software-3.5.0" -release_tag="3.5.1.2" +release_artifact="emccorp/ecs-software-3.6.0" +release_tag="3.6.1.2" release_common_name="emccorp/ecs-software:latest" docker_host_root="/opt/emc/ecs-install" @@ -31,8 +31,8 @@ repo_name='emccorp' image_name='ecs-install' tag='latest' ver_maj='2' -ver_min='11' -ver_rev='0' +ver_min='9' +ver_rev='1' ver_tag='r' serial=0 diff --git a/ui/run.sh b/ui/run.sh index 273e89c3..dc4609fe 100755 --- a/ui/run.sh +++ b/ui/run.sh @@ -122,6 +122,8 @@ case "$(basename ${0})" in run ping_until_clear run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? + /home/admin/ECS-CommunityEdition/patches/3.6.0.0/vnest_patch + o "Please wait for 30 minutes before running next step for services to bootstrap" ;; ova-step1) #run ecsdeploy load || exit $? @@ -130,6 +132,8 @@ case "$(basename ${0})" in run ecsdeploy bootstrap || exit $? run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? + /home/admin/ECS-CommunityEdition/patches/3.6.0.0/vnest_patch + o "Please wait for 30 minutes before running next step for services to bootstrap" ;; step1) #run ecsdeploy load || exit $? @@ -141,6 +145,8 @@ case "$(basename ${0})" in run ping_until_clear run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? + /home/admin/ECS-CommunityEdition/patches/3.6.0.0/vnest_patch + o "Please wait for 30 minutes before running next step for services to bootstrap" ;; step2|island-step3|ova-step2) o "Pinging Management API Endpoint until ready" @@ -149,6 +155,8 @@ case "$(basename ${0})" in o "Pinging Management API Endpoint until ready" run ecsconfig ping -c -x || exit $? run ecsconfig sp -a || exit $? + o "Sleeping for 15 minutes for Storage Pool to be ready" + sleep 900 o "Pinging Management API Endpoint until ready" run ecsconfig ping -c -x || exit $? run ecsconfig vdc -a || exit $? diff --git a/ui/setup.py b/ui/setup.py index 3dc23302..82718946 100755 --- a/ui/setup.py +++ b/ui/setup.py @@ -3,7 +3,7 @@ setup( name='ecsdeploy', - version='2.11.0r', + version='2.9.1r', packages=find_packages(), scripts=['ui.py', 'ecsdeploy.py', From dbf66505eb9877ec5c7ca7b4aede752a798f14c8 Mon Sep 17 00:00:00 2001 From: Nikhil Valsarajan Date: Tue, 20 Jul 2021 12:19:53 +0000 Subject: [PATCH 2/4] 3.6.1.2 changes --- patches/3.6.0.0/vnest_patch | 4 ++-- ui/run.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/patches/3.6.0.0/vnest_patch b/patches/3.6.0.0/vnest_patch index ce6b1383..678cc2d3 100755 --- a/patches/3.6.0.0/vnest_patch +++ b/patches/3.6.0.0/vnest_patch @@ -1,7 +1,7 @@ echo "ECS Vnest patching" >> /tmp/vnest-patch.out sudo docker exec -i ecs-storageos bash <true' /opt/storageos/conf/vnest-common-conf.xml -sed -n 547p /opt/storageos/conf/vnest-common-conf.xml +sed -n 561p /opt/storageos/conf/vnest-common-conf.xml EOF -sleep 3 +sleep 10 sudo kill `pidof vnest` diff --git a/ui/run.sh b/ui/run.sh index dc4609fe..39866aa2 100755 --- a/ui/run.sh +++ b/ui/run.sh @@ -118,7 +118,7 @@ case "$(basename ${0})" in run ecsdeploy check || exit $? run ecsdeploy bootstrap || exit $? run ecsdeploy reboot || exit $? - sleep 10 + sleep 30 run ping_until_clear run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? @@ -132,6 +132,7 @@ case "$(basename ${0})" in run ecsdeploy bootstrap || exit $? run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? + sleep 30 /home/admin/ECS-CommunityEdition/patches/3.6.0.0/vnest_patch o "Please wait for 30 minutes before running next step for services to bootstrap" ;; @@ -145,6 +146,7 @@ case "$(basename ${0})" in run ping_until_clear run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? + sleep 30 /home/admin/ECS-CommunityEdition/patches/3.6.0.0/vnest_patch o "Please wait for 30 minutes before running next step for services to bootstrap" ;; From cfa8fc2b8df7dc1084afec15c31576090ca18d15 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 27 Jul 2021 14:41:37 +0000 Subject: [PATCH 3/4] remove some changes --- patches/3.6.0.0/Dockerfile | 28 ---------------------------- patches/3.6.0.0/build.sh | 4 ---- patches/3.6.0.0/image.conf | 3 --- patches/3.6.0.0/vnest_patch | 7 ------- patches/3.6.1.2/vnest_patch | 7 ------- ui/run.sh | 3 --- 6 files changed, 52 deletions(-) delete mode 100644 patches/3.6.0.0/Dockerfile delete mode 100755 patches/3.6.0.0/build.sh delete mode 100644 patches/3.6.0.0/image.conf delete mode 100755 patches/3.6.0.0/vnest_patch delete mode 100755 patches/3.6.1.2/vnest_patch diff --git a/patches/3.6.0.0/Dockerfile b/patches/3.6.0.0/Dockerfile deleted file mode 100644 index be6ea2fe..00000000 --- a/patches/3.6.0.0/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -# Fixes to the default 3.6.1.2 reduced image. - -# Build on object-reduced image (GA release) -FROM emcvipr/object:3.6.1.2-127130.8f7f1a4b665-reduced - -# Fix disk partitioning script -RUN sed -i '/VMware/ s/$/ \&\& [ ! -e \/data\/is_community_edition ]/' /opt/storageos/bin/storageserver-partition-config.sh \ - && /usr/bin/chmod +x /opt/storageos/bin/storageserver-partition-config.sh - -# Set VNest useSeperateThreadPools to True -#RUN f=/opt/storageos/conf/vnest-common-conf.xml; grep -q "object.UseSeparateThreadPools" $f || sed -i '/properties id="serviceProperties"/a \ \ \ \ \ \ \ \ true' $f -RUN f=/opt/storageos/conf/vnest-common-conf.xml; sed -i '547 i \ \ \ \ \ \ \ \ true' $f - -# Allow allocation of different blocks of a chunk to be stored on the same partition -#RUN f=/opt/storageos/conf/ssm-cf-conf.xml; grep -q '' $f || sed -i 's###g' /opt/storageos/conf/ssm-cf-conf.xml $f - -## Increase memory for transformsvc -#RUN sed -i s/Xmx128m/Xmx512m/ /opt/storageos/bin/transformsvc - -## Set memory for objcontrolsvc -#RUN sed -i s/Xmx96m/Xmx256m/ /opt/storageos/bin/objcontrolsvc - -# Set georeceiver's initialBufferNumOnHeap to something smaller for CE -#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q 'name="initialBufferNumOnHeap" value="5"' $f || sed -i 's/name="initialBufferNumOnHeap" value="60"/name="initialBufferNumOnHeap" value="5"/' $f -#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q '10' $f || sed -i 's#80#10#g' $f - -# Configure CM Object properties: Disable minimum storage device count -#RUN f=/opt/storageos/conf/cm.object.properties; grep -q 'MustHaveEnoughResources=false' $f || sed -i 's/MustHaveEnoughResources=true/MustHaveEnoughResources=false/' $f diff --git a/patches/3.6.0.0/build.sh b/patches/3.6.0.0/build.sh deleted file mode 100755 index 8bfdd7b9..00000000 --- a/patches/3.6.0.0/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -source image.conf - -docker build -t "${IMAGE_REPO}:${IMAGE_VERSION}" . diff --git a/patches/3.6.0.0/image.conf b/patches/3.6.0.0/image.conf deleted file mode 100644 index 5bf7caee..00000000 --- a/patches/3.6.0.0/image.conf +++ /dev/null @@ -1,3 +0,0 @@ -BASE_IMAGE="emcvipr/object:3.6.1.2-127130.8f7f1a4b665-reduced" -IMAGE_REPO="emccorp/ecs-software-3.6.0" -IMAGE_VERSION="3.6.1.2" diff --git a/patches/3.6.0.0/vnest_patch b/patches/3.6.0.0/vnest_patch deleted file mode 100755 index ce6b1383..00000000 --- a/patches/3.6.0.0/vnest_patch +++ /dev/null @@ -1,7 +0,0 @@ -echo "ECS Vnest patching" >> /tmp/vnest-patch.out -sudo docker exec -i ecs-storageos bash <true' /opt/storageos/conf/vnest-common-conf.xml -sed -n 547p /opt/storageos/conf/vnest-common-conf.xml -EOF -sleep 3 -sudo kill `pidof vnest` diff --git a/patches/3.6.1.2/vnest_patch b/patches/3.6.1.2/vnest_patch deleted file mode 100755 index ce6b1383..00000000 --- a/patches/3.6.1.2/vnest_patch +++ /dev/null @@ -1,7 +0,0 @@ -echo "ECS Vnest patching" >> /tmp/vnest-patch.out -sudo docker exec -i ecs-storageos bash <true' /opt/storageos/conf/vnest-common-conf.xml -sed -n 547p /opt/storageos/conf/vnest-common-conf.xml -EOF -sleep 3 -sudo kill `pidof vnest` diff --git a/ui/run.sh b/ui/run.sh index dc4609fe..451116f5 100755 --- a/ui/run.sh +++ b/ui/run.sh @@ -122,7 +122,6 @@ case "$(basename ${0})" in run ping_until_clear run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? - /home/admin/ECS-CommunityEdition/patches/3.6.0.0/vnest_patch o "Please wait for 30 minutes before running next step for services to bootstrap" ;; ova-step1) @@ -132,7 +131,6 @@ case "$(basename ${0})" in run ecsdeploy bootstrap || exit $? run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? - /home/admin/ECS-CommunityEdition/patches/3.6.0.0/vnest_patch o "Please wait for 30 minutes before running next step for services to bootstrap" ;; step1) @@ -145,7 +143,6 @@ case "$(basename ${0})" in run ping_until_clear run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? - /home/admin/ECS-CommunityEdition/patches/3.6.0.0/vnest_patch o "Please wait for 30 minutes before running next step for services to bootstrap" ;; step2|island-step3|ova-step2) From 45503c7fdd996184616462c9dd433682a7663bd5 Mon Sep 17 00:00:00 2001 From: Nikhil Valsarajan Date: Wed, 4 Aug 2021 12:41:00 +0000 Subject: [PATCH 4/4] 3.6.2 branch changes --- docs/source/conf.py | 2 +- patches/3.6.2.0/Dockerfile | 28 ++++++++++++++++++++++++++++ patches/3.6.2.0/build.sh | 4 ++++ patches/3.6.2.0/image.conf | 3 +++ release.conf | 5 +++++ ui/etc/config.yml | 2 +- ui/etc/release.conf | 4 ++-- ui/run.sh | 7 +------ 8 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 patches/3.6.2.0/Dockerfile create mode 100755 patches/3.6.2.0/build.sh create mode 100644 patches/3.6.2.0/image.conf diff --git a/docs/source/conf.py b/docs/source/conf.py index 957a05fe..e1c77609 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -56,7 +56,7 @@ # The short X.Y version. version = u'3.6' # The full version, including alpha/beta/rc tags. -release = u'3.6.1.2' +release = u'3.6.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/patches/3.6.2.0/Dockerfile b/patches/3.6.2.0/Dockerfile new file mode 100644 index 00000000..95b8b7d0 --- /dev/null +++ b/patches/3.6.2.0/Dockerfile @@ -0,0 +1,28 @@ +# Fixes to the default 3.6.2.0 reduced image. + +# Build on object-reduced image (GA release) +FROM emcvipr/object:3.6.2.0-127497.982f3bd4450-reduced + +# Fix disk partitioning script +RUN sed -i '/VMware/ s/$/ \&\& [ ! -e \/data\/is_community_edition ]/' /opt/storageos/bin/storageserver-partition-config.sh \ + && /usr/bin/chmod +x /opt/storageos/bin/storageserver-partition-config.sh + +# Set VNest useSeperateThreadPools to True +#RUN f=/opt/storageos/conf/vnest-common-conf.xml; grep -q "object.UseSeparateThreadPools" $f || sed -i '/properties id="serviceProperties"/a \ \ \ \ \ \ \ \ true' $f +RUN f=/opt/storageos/conf/vnest-common-conf.xml; sed -i '547 i \ \ \ \ \ \ \ \ true' $f + +# Allow allocation of different blocks of a chunk to be stored on the same partition +#RUN f=/opt/storageos/conf/ssm-cf-conf.xml; grep -q '' $f || sed -i 's###g' /opt/storageos/conf/ssm-cf-conf.xml $f + +## Increase memory for transformsvc +#RUN sed -i s/Xmx128m/Xmx512m/ /opt/storageos/bin/transformsvc + +## Set memory for objcontrolsvc +#RUN sed -i s/Xmx96m/Xmx256m/ /opt/storageos/bin/objcontrolsvc + +# Set georeceiver's initialBufferNumOnHeap to something smaller for CE +#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q 'name="initialBufferNumOnHeap" value="5"' $f || sed -i 's/name="initialBufferNumOnHeap" value="60"/name="initialBufferNumOnHeap" value="5"/' $f +#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q '10' $f || sed -i 's#80#10#g' $f + +# Configure CM Object properties: Disable minimum storage device count +#RUN f=/opt/storageos/conf/cm.object.properties; grep -q 'MustHaveEnoughResources=false' $f || sed -i 's/MustHaveEnoughResources=true/MustHaveEnoughResources=false/' $f diff --git a/patches/3.6.2.0/build.sh b/patches/3.6.2.0/build.sh new file mode 100755 index 00000000..8bfdd7b9 --- /dev/null +++ b/patches/3.6.2.0/build.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +source image.conf + +docker build -t "${IMAGE_REPO}:${IMAGE_VERSION}" . diff --git a/patches/3.6.2.0/image.conf b/patches/3.6.2.0/image.conf new file mode 100644 index 00000000..8b879ca0 --- /dev/null +++ b/patches/3.6.2.0/image.conf @@ -0,0 +1,3 @@ +BASE_IMAGE="emcvipr/object:3.6.2.0-127497.982f3bd4450-reduced" +IMAGE_REPO="emccorp/ecs-software-3.6.0" +IMAGE_VERSION="3.6.2.0" diff --git a/release.conf b/release.conf index 559ea589..b43042a8 100644 --- a/release.conf +++ b/release.conf @@ -13,6 +13,11 @@ # ### Older versions ( 3.6 ) # release_artifact="emccorp/ecs-software-3.6.0" +# release_tag="3.6.2.0" +# release_tag="3.6.2.0" +# +### Older versions ( 3.6 ) +# release_artifact="emccorp/ecs-software-3.6.0" # release_tag="3.6.1.2" # release_tag="3.6.1.2" # diff --git a/ui/etc/config.yml b/ui/etc/config.yml index a07fc3f5..ae6c6ab2 100644 --- a/ui/etc/config.yml +++ b/ui/etc/config.yml @@ -32,7 +32,7 @@ ui: ffx_sem: /opt/ffx.sem product: name: ECS - version: 3.6.1.2 + version: 3.6.2.0 vendor: Dell EMC flavor: Community Edition slogan: Free and Frictionless diff --git a/ui/etc/release.conf b/ui/etc/release.conf index 5a5d2380..4aac31f0 100644 --- a/ui/etc/release.conf +++ b/ui/etc/release.conf @@ -8,10 +8,10 @@ # it is provided by or on behalf of EMC. release_name="ECS Community Edition" -release_version="3.6.1.2" +release_version="3.6.2.0" release_product="ECS Software" release_artifact="emccorp/ecs-software-3.6.0" -release_tag="3.6.1.2" +release_tag="3.6.2.0" release_common_name="emccorp/ecs-software:latest" docker_host_root="/opt/emc/ecs-install" diff --git a/ui/run.sh b/ui/run.sh index a4267e6a..273e89c3 100755 --- a/ui/run.sh +++ b/ui/run.sh @@ -118,11 +118,10 @@ case "$(basename ${0})" in run ecsdeploy check || exit $? run ecsdeploy bootstrap || exit $? run ecsdeploy reboot || exit $? - sleep 30 + sleep 10 run ping_until_clear run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? - o "Please wait for 30 minutes before running next step for services to bootstrap" ;; ova-step1) #run ecsdeploy load || exit $? @@ -131,7 +130,6 @@ case "$(basename ${0})" in run ecsdeploy bootstrap || exit $? run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? - o "Please wait for 30 minutes before running next step for services to bootstrap" ;; step1) #run ecsdeploy load || exit $? @@ -143,7 +141,6 @@ case "$(basename ${0})" in run ping_until_clear run ecsdeploy deploy || exit $? run ecsdeploy start || exit $? - o "Please wait for 30 minutes before running next step for services to bootstrap" ;; step2|island-step3|ova-step2) o "Pinging Management API Endpoint until ready" @@ -152,8 +149,6 @@ case "$(basename ${0})" in o "Pinging Management API Endpoint until ready" run ecsconfig ping -c -x || exit $? run ecsconfig sp -a || exit $? - o "Sleeping for 15 minutes for Storage Pool to be ready" - sleep 900 o "Pinging Management API Endpoint until ready" run ecsconfig ping -c -x || exit $? run ecsconfig vdc -a || exit $?