diff --git a/operation-tools/Readme.md b/operation-tools/Readme.md index 94497c3..1e8551f 100644 --- a/operation-tools/Readme.md +++ b/operation-tools/Readme.md @@ -123,7 +123,7 @@ git pull - call the restart script ```bash -ansible-playbook restart.yml +ansible-playbook restart-all.yml ``` - After waiting ~5min restart the recording again: diff --git a/operation-tools/restart-all.yml b/operation-tools/restart-all.yml new file mode 100644 index 0000000..4f85922 --- /dev/null +++ b/operation-tools/restart-all.yml @@ -0,0 +1,3 @@ + +- import_playbook: stop-all.yml +- import_playbook: start-all.yml \ No newline at end of file diff --git a/operation-tools/restart.yml b/operation-tools/restart-api.yml similarity index 79% rename from operation-tools/restart.yml rename to operation-tools/restart-api.yml index a2605d9..8efa290 100644 --- a/operation-tools/restart.yml +++ b/operation-tools/restart-api.yml @@ -1,8 +1,4 @@ -- import_playbook: stop.yml -- import_playbook: start.yml - - - name: restart data api hosts: sf_data_api_databuffer become: true @@ -20,4 +16,4 @@ - name: restart dispatcher-api-databuffer systemd: state: restarted - name: dispatcher-api-databuffer \ No newline at end of file + name: dispatcher-api-databuffer diff --git a/operation-tools/restart-retrieval.yml b/operation-tools/restart-retrieval.yml new file mode 100644 index 0000000..daa31e5 --- /dev/null +++ b/operation-tools/restart-retrieval.yml @@ -0,0 +1,4 @@ + +- import_playbook: stop-retrieval.yml +- import_playbook: start-retrieval.yml +- import_playbook: restart-api.yml \ No newline at end of file diff --git a/operation-tools/start-all.yml b/operation-tools/start-all.yml new file mode 100644 index 0000000..f38d34f --- /dev/null +++ b/operation-tools/start-all.yml @@ -0,0 +1,5 @@ + +- import_playbook: start-db.yml +- import_playbook: start-retrieval.yml +- import_playbook: restart-api.yml + diff --git a/operation-tools/start-db.yml b/operation-tools/start-db.yml new file mode 100644 index 0000000..de21d54 --- /dev/null +++ b/operation-tools/start-db.yml @@ -0,0 +1,18 @@ + +- name: Start nodes + hosts: databuffer + become: true + tasks: + - name: start daq-dispatcher-node + systemd: + state: started + name: daq-dispatcher-node + + - name: sleep for 60 seconds and continue with play + wait_for: + timeout: 60 + + - name: start daq-query-node + systemd: + state: started + name: daq-query-node \ No newline at end of file diff --git a/operation-tools/start-retrieval.yml b/operation-tools/start-retrieval.yml new file mode 100644 index 0000000..4826968 --- /dev/null +++ b/operation-tools/start-retrieval.yml @@ -0,0 +1,14 @@ + +- name: Start all retrieval + hosts: databuffer + become: true + tasks: + - name: start java retrieval + systemd: + state: started + name: retrieval + + - name: start retrieval + systemd: + state: started + name: retrieval-00 \ No newline at end of file diff --git a/operation-tools/start.yml b/operation-tools/start.yml deleted file mode 100644 index 8d23bca..0000000 --- a/operation-tools/start.yml +++ /dev/null @@ -1,29 +0,0 @@ -- name: Start nodes - hosts: databuffer - become: true - tasks: - - - name: start daq-dispatcher-node - systemd: - state: started - name: daq-dispatcher-node - - - name: sleep for 30 seconds and continue with play - wait_for: - timeout: 30 - - - name: start daq-query-node - systemd: - state: started - name: daq-query-node - - - name: start java retrieval - systemd: - state: started - name: retrieval - - - name: start retrieval - systemd: - state: started - name: retrieval-00 - diff --git a/operation-tools/stop-all.yml b/operation-tools/stop-all.yml new file mode 100644 index 0000000..0a37542 --- /dev/null +++ b/operation-tools/stop-all.yml @@ -0,0 +1,3 @@ + +- import_playbook: stop-retrieval.yml +- import_playbook: stop-db.yml diff --git a/operation-tools/stop.yml b/operation-tools/stop-db.yml similarity index 72% rename from operation-tools/stop.yml rename to operation-tools/stop-db.yml index dc31b01..a60f768 100644 --- a/operation-tools/stop.yml +++ b/operation-tools/stop-db.yml @@ -1,18 +1,9 @@ + - name: Stop nodes hosts: databuffer become: true tasks: - - name: stop retrieval - systemd: - state: stopped - name: retrieval-00 - - - name: stop java retrieval - systemd: - state: stopped - name: retrieval - - name: stop daq-dispatcher-node systemd: state: stopped diff --git a/operation-tools/stop-retrieval.yml b/operation-tools/stop-retrieval.yml new file mode 100644 index 0000000..400dc2d --- /dev/null +++ b/operation-tools/stop-retrieval.yml @@ -0,0 +1,14 @@ + +- name: Stop all retrieval + hosts: databuffer + become: true + tasks: + - name: stop retrieval + systemd: + state: stopped + name: retrieval-00 + + - name: stop java retrieval + systemd: + state: stopped + name: retrieval \ No newline at end of file diff --git a/sources/blm.sources b/sources/blm.sources index 01ebb95..e5ceba6 100644 --- a/sources/blm.sources +++ b/sources/blm.sources @@ -1,33 +1,33 @@ { /*DBLMs IOC's - Responsible D. Llorente */ "sources": [ - /* {"stream": "tcp://SINEG01-CVME-DBLM009:9999"}, */ + {"stream": "tcp://SINEG01-CVME-DBLM009:9999"}, {"stream": "tcp://SINLH02-CVME-DBLM018:9999"}, - /* {"stream": "tcp://SINDI02-CVME-DBLM084:9999"}, */ + {"stream": "tcp://SINDI02-CVME-DBLM084:9999"}, {"stream": "tcp://S10DI01-CVME-DBLM113:9999"}, {"stream": "tcp://S10CB04-CVME-DBLM130:9999"}, {"stream": "tcp://S10CB06-CVME-DBLM153:9999"}, - /* {"stream": "tcp://S10CB08-CVME-DBLM170:9999"}, */ + {"stream": "tcp://S10CB08-CVME-DBLM170:9999"}, {"stream": "tcp://S10BC01-CVME-DBLM184:9999"}, {"stream": "tcp://S20CB02-CVME-DBLM234:9999"}, - /* {"stream": "tcp://S20CB04-CVME-DBLM255:9999"}, - {"stream": "tcp://S20SY03-CVME-DBLM269:9999"}, */ + {"stream": "tcp://S20CB04-CVME-DBLM255:9999"}, + {"stream": "tcp://S20SY03-CVME-DBLM269:9999"}, {"stream": "tcp://S20SY03-CVME-DBLM292:9999"}, {"stream": "tcp://S30CB02-CVME-DBLM310:9999"}, - /* {"stream": "tcp://SATCL01-CVME-DBLM328:9999"}, + {"stream": "tcp://SATCL01-CVME-DBLM328:9999"}, {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, {"stream": "tcp://SATCB01-CVME-DBLM355:9999"}, {"stream": "tcp://S30CB10-CVME-DBLM381:9999"}, - {"stream": "tcp://S30CB14-CVME-DBLM417:9999"}, */ + {"stream": "tcp://S30CB14-CVME-DBLM417:9999"}, {"stream": "tcp://SARCL02-CVME-DBLM457:9999"}, - /* {"stream": "tcp://SARCL02-CVME-DBLM469:9999"}, + {"stream": "tcp://SARCL02-CVME-DBLM469:9999"}, {"stream": "tcp://SARMA01-CVME-DBLM482:9999"}, {"stream": "tcp://SARUN01-CVME-DBLM499:9999"}, {"stream": "tcp://SARUN04-CVME-DBLM516:9999"}, - {"stream": "tcp://SARUN08-CVME-DBLM537:9999"}, */ + {"stream": "tcp://SARUN08-CVME-DBLM537:9999"}, {"stream": "tcp://SARUN11-CVME-DBLM546:9999"}, {"stream": "tcp://SARUN13-CVME-DBLM555:9999"}, - /* {"stream": "tcp://SARUN15-CVME-DBLM567:9999"}, */ + {"stream": "tcp://SARUN15-CVME-DBLM567:9999"}, {"stream": "tcp://SARUN20-CVME-DBLM599:9999"} ] } diff --git a/sources/camserver.sources b/sources/camserver.sources index 74bb0dc..7079a53 100644 --- a/sources/camserver.sources +++ b/sources/camserver.sources @@ -23,6 +23,9 @@ /* SATES21-CAMS-PATT1 */ ,{"stream": "tcp://sf-daqsync-12.psi.ch:9003", "labels": ["SATES21-CAMS-PATT1"]} + /* SATES21-CAMS154-GIGE6 */ + ,{"stream": "tcp://sf-daqsync-12.psi.ch:9056", "labels": ["SATES21-CAMS154-GIGE6"]} + /* SARES11-SPEC125-M1 */ ,{"stream": "tcp://sf-daqsync-13:9001", "labels": ["SARES11-SPEC125-M1"]} diff --git a/sources/gunlaser.sources b/sources/gunlaser.sources index cc04230..85200ee 100644 --- a/sources/gunlaser.sources +++ b/sources/gunlaser.sources @@ -8,10 +8,17 @@ ,{"stream": "tcp://SIN-CVME-LAS0071:9999"} ,{"stream": "tcp://SIN-CVME-LAS0201:9999"} /* Wieser sources */ - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10009"} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10045", "labels": ["WIESER_10045"]} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10075", "labels": ["WIESER_10075"]} - /* Test IFC */ - /*,{"stream": "tcp://SIN-CVME-RF02:9999", "labels": ["IFC_TEST_SYS"]}*/ + ,{"stream": "tcp://SF-VSERV-LADC-01:10005", "labels": ["WIESER_10005"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10015", "labels": ["WIESER_10015"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10025", "labels": ["WIESER_10025"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10035", "labels": ["WIESER_10035"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10045", "labels": ["WIESER_10045"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10065", "labels": ["WIESER_10065"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10075", "labels": ["WIESER_10075"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10085", "labels": ["WIESER_10085"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10095", "labels": ["WIESER_10095"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10105", "labels": ["WIESER_10105"]} + /* Scoperecorder IFC */ + ,{"stream": "tcp://SIN-CVME-RF02:9999", "labels": ["IFC_RF02_SYS"]} ] } diff --git a/sources/pumplaser.sources b/sources/pumplaser.sources index b659d7f..29018b5 100644 --- a/sources/pumplaser.sources +++ b/sources/pumplaser.sources @@ -6,10 +6,10 @@ ,{"stream": "tcp://SLAAR-CVME-LAS6891:9999"} ,{"stream": "tcp://SLAAR-CVME-LAS6891:9989"} /* Wieser sources */ - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10205", "labels": ["WIESER_10205"]} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10215", "labels": ["WIESER_10215"]} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10225", "labels": ["WIESER_10225"]} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10235", "labels": ["WIESER_10235"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10205", "labels": ["WIESER_10205"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10215", "labels": ["WIESER_10215"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10225", "labels": ["WIESER_10225"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10235", "labels": ["WIESER_10235"]} /* Spectrometer - SLAAT01-LSPC-SPEC1 */ ,{"stream": "tcp://sf-sioc-cs-b2:9105", "labels": ["BS_SPEC_B2"]} diff --git a/sources/rf_modulator.sources b/sources/rf_modulator.sources new file mode 100644 index 0000000..9af0b7d --- /dev/null +++ b/sources/rf_modulator.sources @@ -0,0 +1,38 @@ +{ +/*LLRF's RF Interlock IOC's with bsread streaming from HV modulator over EtherCAT bridge (=port:9000)*/ + "sources": [ +/*linac 1*/ + {"stream": "tcp://S10CB01-CVME-ILK:9000"} + ,{"stream": "tcp://S10CB02-CVME-ILK:9000"} + ,{"stream": "tcp://S10CB03-CVME-ILK:9000"} + ,{"stream": "tcp://S10CB04-CVME-ILK:9000"} + ,{"stream": "tcp://S10CB05-CVME-ILK:9000"} + ,{"stream": "tcp://S10CB06-CVME-ILK:9000"} + ,{"stream": "tcp://S10CB07-CVME-ILK:9000"} + ,{"stream": "tcp://S10CB08-CVME-ILK:9000"} + ,{"stream": "tcp://S10CB09-CVME-ILK:9000"} +/*linac 2*/ + ,{"stream": "tcp://S20CB01-CVME-ILK:9000"} + ,{"stream": "tcp://S20CB02-CVME-ILK:9000"} + ,{"stream": "tcp://S20CB03-CVME-ILK:9000"} + ,{"stream": "tcp://S20CB04-CVME-ILK:9000"} +/*linac 3*/ + ,{"stream": "tcp://S30CB01-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB02-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB03-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB04-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB05-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB06-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB07-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB08-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB09-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB10-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB11-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB12-CVME-ILK:9000"} + ,{"stream": "tcp://S30CB13-CVME-ILK:9000"} + ] +/*athos*/ +/* ,{"stream": "tcp://SATCB01-CVME-ILK:9000"} + ,{"stream": "tcp://SATMA02-CVME-ILK:9000"} */ +} +