improve multicluster support #62
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
nizamial09
force-pushed
the
multi-cluster-fixes
branch
from
fd86755 to
d2b6712
Compare
epuertat
reviewed
Jun 29, 2022
docker/ceph/start-ceph.sh
Outdated
| @@ -18,15 +18,29 @@ if [[ "$FRONTEND_BUILD_REQUIRED" == 1 ]]; then | |||
| npm update @angular/cli | |||
| fi | |||
|
|
|||
| npm ci | |||
| if [[ "$CEPH_MULTICLUSTER" != '1' ]]; then | |||
| npm ci | |||
There was a problem hiding this comment.
Perhaps a good chance to replace this with npm i (keeps the downloaded node_modules and only installs the changed ones)? npm ci deletes the node_modules dir. I find frustrating that after starting ceph-dev it always takes so long to download and build everything.
If we find that we need a clean install we could add some NPM_CLEAN_INSTALL=1.
docker/ceph/start-ceph.sh
Outdated
|
|
||
| if [[ -z "${DASHBOARD_URL}" ]]; then | ||
| if [[ -z "${DASHBOARD_URL}" ]]; then | ||
| # Required to run dashboard python module. | ||
| npm run build |
There was a problem hiding this comment.
And I wish we could also speed this up by only rebuilding if not there or only incremental builds like the ones from the ng serve instance.
docker/ceph/start-ceph.sh
Outdated
| else | ||
| # Wait until the npm is finished for first cluster | ||
| echo "Waiting for npm to finish..." | ||
| sleep 180 |
There was a problem hiding this comment.
Fixed waits make cry! There are always better ways to avoid and use some busy wait.
Adapting the script to run with the mstart. I introduced a new variable called `NUMBER_OF_CLUSTERS`. All the clusters deployed are on the same container but the dashboard is accessbile on different ports. The first port is configurable and a 100 will be added to the ports of next cluster. for eg. CEPH1 is in 11000 and CEPH2 is in 11100 and CEPH3 is in 11200.... LIMITATIONS SO FAR DEV SERVER ON FIRST CLUSTER ONLY localhost:11000 is somehow not there :( MONITORING STACKS CAN ONLY DEPLOYED ON FIRST CLUSTER Signed-off-by: Nizamudeen A <[email protected]>
nizamial09
force-pushed
the
multi-cluster-fixes
branch
from
d2b6712 to
66471c3
Compare
| @@ -2,6 +2,8 @@ | |||
|
|
|||
| set -e | |||
|
|
|||
| source /docker/set-mstart-env.sh | |||
| @@ -264,12 +266,15 @@ run_frontend_e2e_tests() { | |||
|
|
|||
| DASHBOARD_URL=null | |||
| while [[ "${DASHBOARD_URL}" == 'null' ]]; do | |||
| export DASHBOARD_URL=$("$CEPH_BIN"/ceph mgr services | jq -r .dashboard) | |||
| export DASHBOARD_URL=$(CEPH_CLI mgr services | jq -r .dashboard) | |||
| @@ -264,12 +266,15 @@ run_frontend_e2e_tests() { | |||
|
|
|||
| DASHBOARD_URL=null | |||
| while [[ "${DASHBOARD_URL}" == 'null' ]]; do | |||
| export DASHBOARD_URL=$("$CEPH_BIN"/ceph mgr services | jq -r .dashboard) | |||
| export DASHBOARD_URL=$(CEPH_CLI mgr services | jq -r .dashboard) | |||
| export DASHBOARD2_URL=$(CEPH2_CLI mgr services | jq -r .dashboard) | |||
| echo "export $1" >> /root/.bashrc | ||
| } | ||
|
|
||
| echo $NUMBER_OF_CLUSTERS |
| echo $NUMBER_OF_CLUSTERS | ||
| declare -a CEPH_BIN_LIST | ||
| declare -a CEPH_CLUSTERS | ||
| for (( cluster=1; cluster<=$NUMBER_OF_CLUSTERS; cluster++ )); do |
| @@ -75,8 +90,8 @@ if [[ "$DASHBOARD_SSL" == 0 && "$VSTART_HAS_SSL_FLAG" == 0 && "$IS_FIRST_CLUSTER | |||
| SSL_OPTIONS='' | |||
| fi | |||
|
|
|||
| "$CEPH_BIN"/ceph config set mgr mgr/dashboard/ssl false $SSL_OPTIONS | |||
| "$CEPH_BIN"/ceph config set mgr mgr/dashboard/x/server_port "$CEPH_MGR_DASHBOARD_PORT" $SSL_OPTIONS | |||
| CEPH_CLI_ALL config set mgr mgr/dashboard/ssl false $SSL_OPTIONS | |||
| "$CEPH_BIN"/ceph config set mgr mgr/dashboard/ssl false $SSL_OPTIONS | ||
| "$CEPH_BIN"/ceph config set mgr mgr/dashboard/x/server_port "$CEPH_MGR_DASHBOARD_PORT" $SSL_OPTIONS | ||
| CEPH_CLI_ALL config set mgr mgr/dashboard/ssl false $SSL_OPTIONS | ||
| CEPH_CLI_ALL config set mgr mgr/dashboard/x/server_port "$CEPH_MGR_DASHBOARD_PORT" $SSL_OPTIONS |
| @@ -1,14 +1,15 @@ | |||
| #!/bin/bash | |||
|
|
|||
| set -e | |||
| source /docker/set-mstart-env.sh | |||
|
|
||
| echo $CEPH1 |
| @@ -2,6 +2,8 @@ | |||
|
|
|||
| set -e | |||
|
|
|||
| source /docker/set-mstart-env.sh | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on ceph/ceph#47371
Adapting the script to run with the mstart.
I introduced a new variable called
NUMBER_OF_CLUSTERS. All theclusters deployed are on the same container but the dashboard is
accessbile on different ports.
The first port is configurable and a 100 will be added to the ports of
next cluster
for eg. CEPH1 is in 11000 and CEPH2 is in 11100 and CEPH3 is in
11200....
This will co-exist with the current approach of two cluster support.
LIMITATIONS SO FAR
Signed-off-by: Nizamudeen A [email protected]