From 2524e210088753304bc31d23b3e8a6629933c5ad Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 7 May 2021 17:59:07 +0200
Subject: [PATCH] update infiniband config
---
.../asapo_services/scripts/discovery.json.tpl | 2 +-
.../asapo_services/scripts/receiver.json.tpl | 2 +-
.../consumer/consumer_api_test.py | 27 +++++++++++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 tests/manual/python_tests/consumer/consumer_api_test.py
diff --git a/deploy/asapo_services/scripts/discovery.json.tpl b/deploy/asapo_services/scripts/discovery.json.tpl
index 98bfa9a4e..0dc045609 100644
--- a/deploy/asapo_services/scripts/discovery.json.tpl
+++ b/deploy/asapo_services/scripts/discovery.json.tpl
@@ -2,7 +2,7 @@
"Mode": "consul",
"Receiver": {
"MaxConnections": 32,
- "UseIBAddress": {{ keyOrDefault "use_ib_for_receiver" "true" }}
+ "UseIBAddress": {{ keyOrDefault "use_ib_for_receiver" "false" }}
},
"Port": {{ env "NOMAD_PORT_discovery" }},
"LogLevel": "{{ keyOrDefault "log_level" "info" }}"
diff --git a/deploy/asapo_services/scripts/receiver.json.tpl b/deploy/asapo_services/scripts/receiver.json.tpl
index e5214deed..2a69b27e9 100644
--- a/deploy/asapo_services/scripts/receiver.json.tpl
+++ b/deploy/asapo_services/scripts/receiver.json.tpl
@@ -8,7 +8,7 @@
"AuthorizationInterval": 10000,
"ListenPort": {{ env "NOMAD_PORT_recv" }},
"DataServer": {
- "AdvertiseURI": "{{ if or (env "meta.ib_address") "none" | regexMatch "none" }}{{ env "NOMAD_IP_recv" }}{{ else }}{{ env "meta.ib_address" }}{{ end }}:{{ env "NOMAD_PORT_recv_ds" }}",
+ "AdvertiseURI": "{{ if env "NOMAD_META_receiver_network_modes" | regexMatch "tcp" }}{{ env "NOMAD_IP_recv" }}{{ else if or (env "meta.ib_address") "none" | regexMatch "none" }}{{ env "NOMAD_IP_recv" }}{{ else }}{{ env "meta.ib_address" }}{{ end }}:{{ env "NOMAD_PORT_recv_ds" }}",
"NThreads": {{ env "NOMAD_META_receiver_dataserver_nthreads" }},
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }},
"NetworkMode": ["{{ if or (env "meta.ib_address") "none" | regexMatch "none" }}{{ printf "%s" "tcp" }}{{ else }}{{ env "NOMAD_META_receiver_network_modes" | split "," | join "\",\"" }}{{ end }}"]
diff --git a/tests/manual/python_tests/consumer/consumer_api_test.py b/tests/manual/python_tests/consumer/consumer_api_test.py
new file mode 100644
index 000000000..a8f270ad7
--- /dev/null
+++ b/tests/manual/python_tests/consumer/consumer_api_test.py
@@ -0,0 +1,27 @@
+import asapo_consumer
+import time
+
+endpoint = "asap3-utl01.desy.de:8400"
+beamtime = "11012171"
+token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MzU3NTMxMDksImp0aSI6ImMyOTR0NWFodHY1am9vZHVoaGNnIiwic3ViIjoiYnRfMTEwMTIxNzEiLCJFeHRyYUNsYWltcyI6eyJBY2Nlc3NUeXBlcyI6WyJyZWFkIiwid3JpdGUiXX19.kITePbv_dXY2ACxpAQ-PeQJPQtnR02bMoFrXq0Pbcm0"
+datasource = 'VmFyZXgx'
+
+consumer = asapo_consumer.create_consumer(endpoint,"/asap3/petra3/gpfs/p21.2/2021/data/11012171",False,
+ beamtime,datasource,token,20000)
+laststream=consumer.get_stream_list()[-1]["name"]
+print("laststream = " + laststream)
+
+group_id = consumer.generate_group_id()
+t1=time.time()
+
+data, meta = consumer.get_next(group_id, meta_only = False, stream=laststream)
+#meta['buf_id'] = 0
+#data = consumer.retrieve_data(meta)
+
+
+print ("total time: %f" % (time.time()-t1))
+
+print ('id:',meta['_id'])
+print ('file name:',meta['name'])
+print ('file content:',repr(data.tobytes()[:1000]))
+
--
GitLab