From b087c781a65496428640b01af1ba773176674af0 Mon Sep 17 00:00:00 2001 From: punkryn Date: Sun, 21 Apr 2024 15:59:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?csv=20file=20=EC=9D=BD=EA=B8=B0=EC=97=90?= =?UTF-8?q?=EC=84=9C=20json=20file=20=EC=9D=BD=EA=B8=B0=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0_retry_100_waitTime_100_leaseTime_100_0.csv | 17 ----------------- ...0_retry_100_waitTime_100_leaseTime_100_1.csv | 17 ----------------- ...0_retry_100_waitTime_100_leaseTime_100_3.csv | 17 ----------------- ...0_retry_100_waitTime_100_leaseTime_100_0.csv | 17 ----------------- ...0_retry_100_waitTime_100_leaseTime_100_1.csv | 17 ----------------- ...0_retry_100_waitTime_100_leaseTime_100_2.csv | 17 ----------------- stress-test/test-result-combiner.py | 7 ++++--- 7 files changed, 4 insertions(+), 105 deletions(-) delete mode 100644 stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_0.csv delete mode 100644 stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_1.csv delete mode 100644 stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_3.csv delete mode 100644 stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_0.csv delete mode 100644 stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_1.csv delete mode 100644 stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_2.csv diff --git a/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_0.csv b/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_0.csv deleted file mode 100644 index ecacd9a..0000000 --- a/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_0.csv +++ /dev/null @@ -1,17 +0,0 @@ -metric_name,timestamp,metric_value,check,error,error_code,group,method,name,proto,scenario,status,subproto,tls_version,url,extra_tags -http_reqs,1595325560,1.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_duration,1595325560,221.899000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_blocked,1595325560,225.275000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_connecting,1595325560,217.680000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_tls_handshaking,1595325560,0.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_sending,1595325560,0.112000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_waiting,1595325560,220.280000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_receiving,1595325560,1.507000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -vus,1595325560,1.000000,,,,,,,,,,,,, -vus_max,1595325560,20.000000,,,,,,,,,,,,, -checks,1595325561,1.000000,status is 200,,,,,,,default,,,,, -checks,1595325561,0.000000,response body,,,,,,,default,,,,, -data_sent,1595325561,76.000000,,,,,,,,default,,,,, -data_received,1595325561,11045.000000,,,,,,,,default,,,,, -iteration_duration,1595325561,1449.049580,,,,,,,,default,,,,, -iterations,1595325561,1.000000,,,,,,,,default,,,,, \ No newline at end of file diff --git a/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_1.csv b/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_1.csv deleted file mode 100644 index a89563e..0000000 --- a/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_1.csv +++ /dev/null @@ -1,17 +0,0 @@ -metric_name,timestamp,metric_value,check,error,error_code,group,method,name,proto,scenario,status,subproto,tls_version,url,extra_tags -http_reqs,1595325560,1.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_duration,1595325560,222.899000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_blocked,1595325560,225.275000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_connecting,1595325560,217.680000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_tls_handshaking,1595325560,0.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_sending,1595325560,0.112000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_waiting,1595325560,220.280000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_receiving,1595325560,1.507000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -vus,1595325560,1.000000,,,,,,,,,,,,, -vus_max,1595325560,20.000000,,,,,,,,,,,,, -checks,1595325561,1.000000,status is 200,,,,,,,default,,,,, -checks,1595325561,0.000000,response body,,,,,,,default,,,,, -data_sent,1595325561,76.000000,,,,,,,,default,,,,, -data_received,1595325561,11045.000000,,,,,,,,default,,,,, -iteration_duration,1595325561,1449.049580,,,,,,,,default,,,,, -iterations,1595325561,1.000000,,,,,,,,default,,,,, \ No newline at end of file diff --git a/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_3.csv b/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_3.csv deleted file mode 100644 index 2451520..0000000 --- a/stress-test/result/test/olock_vus_100_tickets_10_backoff_10_retry_100_waitTime_100_leaseTime_100_3.csv +++ /dev/null @@ -1,17 +0,0 @@ -metric_name,timestamp,metric_value,check,error,error_code,group,method,name,proto,scenario,status,subproto,tls_version,url,extra_tags -http_reqs,1595325560,1.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_duration,1595325560,223.899000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_blocked,1595325560,225.275000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_connecting,1595325560,217.680000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_tls_handshaking,1595325560,0.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_sending,1595325560,0.112000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_waiting,1595325560,220.280000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_receiving,1595325560,1.507000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -vus,1595325560,1.000000,,,,,,,,,,,,, -vus_max,1595325560,20.000000,,,,,,,,,,,,, -checks,1595325561,1.000000,status is 200,,,,,,,default,,,,, -checks,1595325561,0.000000,response body,,,,,,,default,,,,, -data_sent,1595325561,76.000000,,,,,,,,default,,,,, -data_received,1595325561,11045.000000,,,,,,,,default,,,,, -iteration_duration,1595325561,1449.049580,,,,,,,,default,,,,, -iterations,1595325561,1.000000,,,,,,,,default,,,,, \ No newline at end of file diff --git a/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_0.csv b/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_0.csv deleted file mode 100644 index 1ec9ef9..0000000 --- a/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_0.csv +++ /dev/null @@ -1,17 +0,0 @@ -metric_name,timestamp,metric_value,check,error,error_code,group,method,name,proto,scenario,status,subproto,tls_version,url,extra_tags -http_reqs,1595325560,1.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_duration,1595325560,231.899000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_blocked,1595325560,225.275000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_connecting,1595325560,217.680000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_tls_handshaking,1595325560,0.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_sending,1595325560,0.112000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_waiting,1595325560,220.280000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_receiving,1595325560,1.507000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -vus,1595325560,1.000000,,,,,,,,,,,,, -vus_max,1595325560,20.000000,,,,,,,,,,,,, -checks,1595325561,1.000000,status is 200,,,,,,,default,,,,, -checks,1595325561,0.000000,response body,,,,,,,default,,,,, -data_sent,1595325561,76.000000,,,,,,,,default,,,,, -data_received,1595325561,11045.000000,,,,,,,,default,,,,, -iteration_duration,1595325561,1449.049580,,,,,,,,default,,,,, -iterations,1595325561,1.000000,,,,,,,,default,,,,, \ No newline at end of file diff --git a/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_1.csv b/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_1.csv deleted file mode 100644 index 393cce0..0000000 --- a/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_1.csv +++ /dev/null @@ -1,17 +0,0 @@ -metric_name,timestamp,metric_value,check,error,error_code,group,method,name,proto,scenario,status,subproto,tls_version,url,extra_tags -http_reqs,1595325560,1.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_duration,1595325560,241.899000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_blocked,1595325560,225.275000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_connecting,1595325560,217.680000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_tls_handshaking,1595325560,0.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_sending,1595325560,0.112000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_waiting,1595325560,220.280000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_receiving,1595325560,1.507000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -vus,1595325560,1.000000,,,,,,,,,,,,, -vus_max,1595325560,20.000000,,,,,,,,,,,,, -checks,1595325561,1.000000,status is 200,,,,,,,default,,,,, -checks,1595325561,0.000000,response body,,,,,,,default,,,,, -data_sent,1595325561,76.000000,,,,,,,,default,,,,, -data_received,1595325561,11045.000000,,,,,,,,default,,,,, -iteration_duration,1595325561,1449.049580,,,,,,,,default,,,,, -iterations,1595325561,1.000000,,,,,,,,default,,,,, \ No newline at end of file diff --git a/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_2.csv b/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_2.csv deleted file mode 100644 index 747aff5..0000000 --- a/stress-test/result/test/olock_vus_100_tickets_10_backoff_300_retry_100_waitTime_100_leaseTime_100_2.csv +++ /dev/null @@ -1,17 +0,0 @@ -metric_name,timestamp,metric_value,check,error,error_code,group,method,name,proto,scenario,status,subproto,tls_version,url,extra_tags -http_reqs,1595325560,1.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_duration,1595325560,251.899000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_blocked,1595325560,225.275000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_connecting,1595325560,217.680000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_tls_handshaking,1595325560,0.000000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_sending,1595325560,0.112000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_waiting,1595325560,220.280000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -http_req_receiving,1595325560,1.507000,,,,,GET,http://test.k6.io,HTTP/1.1,default,200,,,http://test.k6.io, -vus,1595325560,1.000000,,,,,,,,,,,,, -vus_max,1595325560,20.000000,,,,,,,,,,,,, -checks,1595325561,1.000000,status is 200,,,,,,,default,,,,, -checks,1595325561,0.000000,response body,,,,,,,default,,,,, -data_sent,1595325561,76.000000,,,,,,,,default,,,,, -data_received,1595325561,11045.000000,,,,,,,,default,,,,, -iteration_duration,1595325561,1449.049580,,,,,,,,default,,,,, -iterations,1595325561,1.000000,,,,,,,,default,,,,, \ No newline at end of file diff --git a/stress-test/test-result-combiner.py b/stress-test/test-result-combiner.py index 5410b06..eeb79a5 100644 --- a/stress-test/test-result-combiner.py +++ b/stress-test/test-result-combiner.py @@ -40,10 +40,10 @@ def makeResult(p: Path): countDict[fileName] = 0 with x.open('r', newline='') as f: - df = pd.read_csv(f) + df = pd.read_json(f) # metric_name,timestamp,metric_value,check,error,error_code,group,method,name,proto,scenario,status,subproto,tls_version,url,extra_tags - durationDict[fileName] += df[df['metric_name'] == TARGET]['metric_value'].values[0] + durationDict[fileName] += df['metrics']['http_req_duration']['values']['avg'] countDict[fileName] += 1 for key in durationDict: @@ -68,7 +68,8 @@ def writeResultFile(p: Path, result: dict): assert len(sys.argv) > 1, 'iteration을 지정할 인자가 필요합니다.' - path = '/'.join(['./result', sys.argv[1]]) + # path = '/'.join(['./result', sys.argv[1]]) + path = './output' validateDir(path) p = Path(path) From b47a47be1e7aae5d475a75d2884400b053e7a38b Mon Sep 17 00:00:00 2001 From: punkryn Date: Mon, 22 Apr 2024 10:51:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=9A=8C=EC=B0=A8=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=9D=BC=20=EC=9D=BD=EB=8A=94=20=ED=8C=8C=EC=9D=BC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stress-test/test-result-combiner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stress-test/test-result-combiner.py b/stress-test/test-result-combiner.py index eeb79a5..5f0493b 100644 --- a/stress-test/test-result-combiner.py +++ b/stress-test/test-result-combiner.py @@ -33,6 +33,9 @@ def makeResult(p: Path): if x.name == RESULT_FILE_NAME: continue + if x.name.split('.')[0].split('_')[-1] != sys.argv[1]: + continue + fileName = getNameWithoutIteration(x.name) if fileName not in durationDict: @@ -75,6 +78,6 @@ def writeResultFile(p: Path, result: dict): result = makeResult(p) - path = '/'.join(['./result', sys.argv[1], 'result.csv']) + path = '/'.join(['./result', 'result_' + sys.argv[1] + '.csv']) p = Path(path) writeResultFile(p, result)