From 31c7509eb8a6ea5498e78b0c326f60733c0a9791 Mon Sep 17 00:00:00 2001 From: yanhuanwang Date: Wed, 11 Sep 2019 15:15:21 +0200 Subject: [PATCH] fix a race condition bug in dfc csit Change-Id: Ibed69f6a1ac068d7b088ed0367ea5b59e29f933f Signed-off-by: Martin Yan Issue-ID: DCAEGEN2-1702 --- .../dcaegen2-collectors-datafile/dfc-management/dfc-start.sh | 10 ---------- .../Functional-Single-File-suite/FuncSingleFile.robot | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh index 68e0745d..c63eaf68 100755 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh @@ -17,16 +17,6 @@ for i in {1..10}; do if [ $(docker inspect --format '{{ .State.Running }}' $DFC_APP) ] then echo "DFC app Running" - - # enable TRACE logging of DFC - docker exec $DFC_APP /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml" - - #enable TRACE logging of spring-framework - docker exec $DFC_APP /bin/sh -c " sed -i 's/org.springframework.data: ERROR/org.springframework.data: TRACE/g' /opt/app/datafile/config/application.yaml" - - docker restart $DFC_APP - sleep 10 - break else echo sleep $i diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot index 823a9b27..0763583e 100755 --- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot +++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot @@ -32,12 +32,12 @@ Verify single event with single 1MB SFTP file. From event poll to published file Set Environment Variable FTP_TYPE SFTP Set Environment Variable NUM_FTP_SERVERS 1 Set Environment Variable DR_FEEDS 2:A - Set Environment Variable DRR_SIM_IP drsim_redir + Set Environment Variable DR_REDIR_SIM drsim_redir Set Environment Variable SFTP_SIMS sftp-server0:22 Set Environment Variable FTPS_SIMS ftpes-server-vsftpd0:21 ${cli_cmd_output}= Run Process ./simulators-start.sh cwd=${SIMGROUP_ROOT} - Log To Console Simulator-start: + Log To Console Simulator-start: Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} MR Sim Emitted Files Equal 0 #Verify 0 file emitted from MR sim DR Sim Published Files Equal 0 #Verify 0 file published to DR sim -- 2.16.6