From 1f8db10d94f6020f971c2a7fad5ea560db2beb33 Mon Sep 17 00:00:00 2001 From: "m.malygina" Date: Thu, 20 Jun 2024 16:37:00 +0300 Subject: [PATCH] add logs to delete Signed-off-by: m.malygina --- internal/s3/client.go | 2 +- scenarios/s3_dar.js | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/internal/s3/client.go b/internal/s3/client.go index ac0937c..0765807 100644 --- a/internal/s3/client.go +++ b/internal/s3/client.go @@ -108,7 +108,7 @@ func (c *Client) Multipart(bucket, key string, objPartSize, concurrency int, pay func (c *Client) Delete(bucket, key string) DeleteResponse { start := time.Now() - println("Delete bucket:", bucket, " key:", key) + _, err := c.cli.DeleteObject(c.vu.Context(), &s3.DeleteObjectInput{ Bucket: aws.String(bucket), Key: aws.String(key), diff --git a/scenarios/s3_dar.js b/scenarios/s3_dar.js index c7cbe29..cc9c7ef 100644 --- a/scenarios/s3_dar.js +++ b/scenarios/s3_dar.js @@ -86,8 +86,7 @@ const delete_age = __ENV.DELETE_AGE ? parseInt(__ENV.DELETE_AGE) : undefined; let obj_to_delete_selector = undefined; let obj_to_delete_exit_on_null = undefined; if (registry_enabled && delete_age) { - obj_to_delete_exit_on_null = (write_vu_count == 0) && (read_vu_count == 0); - console.debug(`obj_to_delete_exit_on_null: ${obj_to_delete_exit_on_null}`); + obj_to_delete_exit_on_null = (write_vu_count == 0) && (read_vu_count == 0) let constructor = obj_to_delete_exit_on_null ? registry.getOneshotSelector : registry.getSelector; @@ -139,9 +138,8 @@ export function setup() { } export function teardown(data) { - console.log("Teardown") if (obj_registry) { - obj_registry.close() + obj_registry.close(); } const end_timestamp = Date.now() console.log( @@ -179,13 +177,12 @@ export function obj_read() { if (__ENV.SLEEP_READ) { sleep(__ENV.SLEEP_READ); } - log.withFields({op : 'obj_read - ENTERED'}).info("INFO"); + if (obj_to_read_selector) { const obj = obj_to_read_selector.nextObject(); if (!obj ) { return; } - log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'READ START'}).info("INFO"); const resp = s3_client.get(obj.s3_bucket, obj.s3_key) if (!resp.success) { log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, status: obj.status, op: `READ`}) @@ -193,7 +190,7 @@ export function obj_read() { } else { obj_registry.setObjectStatus(obj.id, obj.status, 'read'); } - log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'READ FINISHED'}).info("INFO"); + return } @@ -211,7 +208,7 @@ export function obj_delete() { if (__ENV.SLEEP_DELETE) { sleep(__ENV.SLEEP_DELETE); } - log.withFields({op : 'obj_delete - ENTERED'}).info("INFO"); + const obj = obj_to_delete_selector.nextObject(); delete_object(obj) } @@ -223,13 +220,13 @@ export function delete_object(obj) { } return; } - log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETED START'}).info("INFO"); + const resp = s3_client.delete(obj.s3_bucket, obj.s3_key); if (!resp.success) { log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETE'}) .error(resp.error); return; } - log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETED SUCCESS'}).info("INFO"); + obj_registry.deleteObject(obj.id); } \ No newline at end of file