Tickets/dm 17656 #508
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # | ||
| # Configuration file for log4cxx | ||
| # can be used for unit test | ||
| # by launching next command before unit tests: | ||
| # export LSST_LOG_CONFIG=$HOME/.lsst/log4cxx.unittest.properties | ||
| # | ||
|
|
||
| log4j.rootLogger=INFO, CONSOLE | ||
| #log4j.rootLogger=DEBUG, CONSOLE | ||
| #log4j.rootLogger=WARN, CONSOLE | ||
|
|
||
| log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout | ||
| #log4j.appender.CONSOLE.layout.ConversionPattern=[%d{yyyy-MM-ddTHH:mm:ss.SSSZ}] [%t] %-5p %c{2} (%F:%L) - %m%n | ||
| log4j.appender.CONSOLE.layout.ConversionPattern=[%d{ddTHH:mm:ss.SSSZ}] [%t] %-5p %c{2} (%F:%L) - %m%n | ||
|
|
||
| # Tune log at the module level | ||
| #log4j.logger.lsst.qserv.util=DEBUG |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # | ||
| # Configuration file for log4cxx | ||
| # can be used for unit test | ||
| # by launching next command before unit tests: | ||
| # export LSST_LOG_CONFIG=$HOME/.lsst/log4cxx.unittest.properties | ||
| # | ||
|
|
||
| #log4j.rootLogger=INFO, CONSOLE | ||
| log4j.rootLogger=DEBUG, CONSOLE | ||
| #log4j.rootLogger=WARN, CONSOLE | ||
|
|
||
| log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout | ||
| #log4j.appender.CONSOLE.layout.ConversionPattern=[%d{yyyy-MM-ddTHH:mm:ss.SSSZ}] [%t] %-5p %c{2} (%F:%L) - %m%n | ||
| log4j.appender.CONSOLE.layout.ConversionPattern=[%d{ddTHH:mm:ss.SSSZ}] [%t] %-5p %c{2} (%F:%L) - %m%n | ||
|
|
||
| # Tune log at the module level | ||
| #log4j.logger.lsst.qserv.util=DEBUG |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #! /bin/bash | ||
|
There was a problem hiding this comment. I would also recommend adding: to this and all other shell scripts. This will terminate the on errors and prevent unreliable results. See more on tis at: |
||
|
|
||
| # qserv/admin/tools/docker/loader/container/buildContainers.bash | ||
| # cd back to base qserv directory as the Dockerfile COPY needs the entire project | ||
| # in the docker context. | ||
| cd ../../../../../../qserv | ||
| docker build -f admin/tools/docker/index/container/dev/Dockerfile -t qserv/indexbase:dev . | ||
|
|
||
| # go to individual directories to minimize the size of docker's context copy | ||
| # worker | ||
| cd admin/tools/docker/index/container/dev/worker/ && docker build -t qserv/indexworker:dev . | ||
| #docker build -f admin/tools/docker/index/container/dev/worker/Dockerfile -t qserv/indexworker:dev . | ||
|
|
||
| # master | ||
| cd ../master/ && docker build -t qserv/indexmaster:dev . | ||
| #docker build -f admin/tools/docker/index/container/dev/master/Dockerfile -t qserv/indexmaster:dev . | ||
|
|
||
| # clientNum | ||
| cd ../clientNum/ && docker build -t qserv/indexclientnum:dev . | ||
| #docker build -f admin/tools/docker/index/container/dev/clientNum/Dockerfile -t qserv/indexclientnum:dev . | ||
|
|
||
|
|
||
|
|
||
| docker build -f admin/tools/docker/index/container/dev/Dockerfile -t qserv/indexbase:dev . && \ | ||
| cd admin/tools/docker/index/container/dev/worker/ && docker build -t qserv/indexworker:dev . && \ | ||
| cd ../master/ && docker build -t qserv/indexmaster:dev . && \ | ||
| cd ../clientNum/ && docker build -t qserv/indexclientnum:dev . && \ | ||
| cd ../../../../../../../../qserv | ||
| docker push qserv/indexmaster:dev && docker push qserv/indexworker:dev && docker push qserv/indexclientnum:dev | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # docker build -f admin/tools/docker/index/container/dev/Dockerfile -t qserv/indexbase:dev . | ||
| # | ||
| # Using the development toolchain | ||
|
|
||
| FROM qserv/qserv:dev | ||
|
|
||
| USER 0 | ||
|
|
||
| #RUN mv /usr/bin/sh /usr/bin/sh.old && ln -s /usr/bin/bash /usr/bin/sh | ||
| RUN yum update --assumeyes && yum install --assumeyes bind-utils gdb screen | ||
|
|
||
| USER 1000 | ||
|
|
||
| RUN mkdir /home/qserv/dev/ && \ | ||
| chown -R qserv:qserv /home/qserv | ||
|
|
||
| COPY --chown=qserv:qserv . /home/qserv/dev/qserv | ||
|
|
||
| RUN bash -lc "rm -rf /home/qserv/dev/qserv/build /home/qserv/dev/qserv/share /home/qserv/dev/qserv/bin && \ | ||
| cd /qserv/stack/ && source ./loadLSST.bash && \ | ||
| cd /home/qserv/dev/qserv && setup -r . -t qserv-dev && \ | ||
| printenv && \ | ||
| scons -j10 install && \ | ||
| mkdir -p /home/qserv/run && \ | ||
| qserv-configure.py --all -R /home/qserv/run" | ||
|
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # | ||
|
There was a problem hiding this comment. What's a point in building a separate binary container for each tool ( I think you may just add the name of a script/binary as an extra argument in the Kubernetes YAML file: There was a problem hiding this comment. It made the yaml scripts easier to write and get working (which was not easy) and an actual instance of the system would not have the client apps, as they are only for testing. It would make sense to eventually trim down the containers so they only contain what they really need. |
||
| # | ||
| # cd ~/work/qserv/admin/tools/docker/index/container/dev/clientNum | ||
| # docker build -t qserv/indexclientnum:dev . | ||
| FROM qserv/indexbase:dev | ||
|
|
||
| USER 0 | ||
|
|
||
| RUN yum update --assumeyes && yum install --assumeyes bind-utils | ||
|
|
||
| USER 1000 | ||
|
|
||
| ENTRYPOINT ["/home/qserv/dev/qserv/admin/tools/docker/index/container/dev/clientNum/appClientNum.bash"] | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #! /bin/bash -l | ||
| # admin/tools/docker/loader/container/dev/clientNum/appClientNum.bash | ||
|
|
||
| _term() { | ||
| echo "Caught SIGTERM signal!" | ||
| kill -TERM "$child" 2>/dev/null | ||
| } | ||
|
|
||
| trap _term SIGTERM | ||
| trap _term SIGKILL | ||
|
|
||
| source /qserv/stack/loadLSST.bash | ||
| cd /home/qserv/dev/qserv | ||
| setup -r . -t qserv-dev | ||
|
|
||
| export LSST_LOG_CONFIG=/home/qserv/dev/qserv/admin/templates/configuration/etc/log4cxx.index.properties | ||
|
|
||
| echo appClientNum $1 $2 $3 | ||
|
|
||
| /home/qserv/dev/qserv/build/loader/appClientNum $1 $2 /home/qserv/dev/qserv/core/modules/loader/config/$3 | ||
|
|
||
| child=$! | ||
| wait "$child" | ||
|
There was a problem hiding this comment. Why this is needed here? I don't see anything above which would be launching a detached process. There was a problem hiding this comment. I believe Kubernetes or microk8s wasn't able to kill these containers until all this was added. They'd get stuck terminating the pods. |
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #! /bin/bash -l | ||
| # admin/tools/docker/loader/container/dev/clientNum/appClientNumScreen.bash | ||
|
|
||
| echo appClientScreen $1 $2 $3 | ||
|
|
||
| screen -dm /home/qserv/dev/qserv/admin/tools/docker/index/container/dev/clientNum/appClientNum $1 $2 $3 | ||
|
|
||
|
|
||
| tail -f /dev/null | ||
|
There was a problem hiding this comment. The NEWLINE symbol is missing in the end of the file |
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # Run the following build command from the qserv base directory (could be ~/work/qserv or ~/development/qserv) | ||
| # The COPY command can only access files below $PWD in the file tree. | ||
| # cd ~/work/qserv/admin/tools/docker/index/container/dev/master | ||
| # docker build -t qserv/indexmaster:dev . | ||
| FROM qserv/indexbase:dev | ||
|
|
||
| USER 0 | ||
|
|
||
| RUN yum update --assumeyes && yum install --assumeyes bind-utils | ||
|
|
||
| USER 1000 | ||
|
|
||
| ENTRYPOINT ["/home/qserv/dev/qserv/admin/tools/docker/index/container/dev/master/appMaster.bash"] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #! /bin/bash -l | ||
| # admin/tools/docker/loader/container/dev/master/appMaster.bash | ||
|
|
||
| _term() { | ||
| echo "Caught SIGTERM signal!" | ||
| kill -TERM "$child" 2>/dev/null | ||
| } | ||
|
|
||
| trap _term SIGTERM | ||
| trap _term SIGKILL | ||
|
|
||
| source /qserv/stack/loadLSST.bash | ||
| cd /home/qserv/dev/qserv | ||
| setup -r . -t qserv-dev | ||
|
|
||
| export LSST_LOG_CONFIG=/home/qserv/dev/qserv/admin/templates/configuration/etc/log4cxx.index_master.properties | ||
|
|
||
| /home/qserv/dev/qserv/build/loader/appMaster /home/qserv/dev/qserv/core/modules/loader/config/master.cnf | ||
|
|
||
| child=$! | ||
| echo "child ${child}" | ||
| wait "$child" | ||
|
There was a problem hiding this comment. Why this is needed here? I don't see anything above which would be launching a detached process. |
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # | ||
| # | ||
| # cd ~/work/qserv/admin/tools/docker/index/container/dev/worker | ||
| # docker build -t qserv/indexworker:dev . | ||
| FROM qserv/indexbase:dev | ||
|
|
||
| USER 0 | ||
|
|
||
| RUN yum update --assumeyes && yum install --assumeyes bind-utils | ||
|
|
||
| USER 1000 | ||
|
|
||
| ENTRYPOINT ["/home/qserv/dev/qserv/admin/tools/docker/index/container/dev/worker/appWorker.bash"] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #! /bin/bash | ||
| # admin/tools/docker/loader/container/dev/worker/appWorker.bash | ||
|
|
||
| _term() { | ||
| echo "Caught SIGTERM signal!" | ||
| kill -TERM "$child" 2>/dev/null | ||
| } | ||
|
|
||
| trap _term SIGTERM | ||
| trap _term SIGKILL | ||
|
|
||
| source /qserv/stack/loadLSST.bash | ||
| cd /home/qserv/dev/qserv | ||
| setup -r . -t qserv-dev | ||
|
|
||
| export LSST_LOG_CONFIG=/home/qserv/dev/qserv/admin/templates/configuration/etc/log4cxx.index.properties | ||
|
|
||
| /home/qserv/dev/qserv/build/loader/appWorker /home/qserv/dev/qserv/core/modules/loader/config/worker-k8s-a.cnf | ||
|
|
||
| child=$! | ||
| echo "child ${child}" | ||
| wait "$child" |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #! /bin/bash | ||
| # admin/tools/docker/loader/container/dev/worker/appWorkerScreen.bash | ||
|
|
||
|
|
||
| screen -dm /home/qserv/dev/qserv/admin/tools/docker/index/container/dev/worker/appWorker.bash | ||
|
|
||
| tail -f /dev/null | ||
|
There was a problem hiding this comment. The NEWLINE symbol is missing in the end of the file |
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on my understanding on what the script does it's supposed to be launched from (
cd <path>) some specific directory (which is the same one where the script runs. This opens numerous possibilities for making mistakes. I would recommend passing a target folder as a parameter to the script, so that it could be run like:You may get and evaluate a value of the parameter with: