internal/registry/obj_selector.go

@@ -9,8 +9,6 @@ import (
 	"go.etcd.io/bbolt"
 )
 
-const nextObjectTimeout = 10 * time.Second
-
 type ObjFilter struct {
 	Status string
 	Age    int
@@ -59,16 +57,7 @@ func NewObjSelector(registry *ObjRegistry, selectionSize int, kind SelectorKind,
 //   - underlying registry context is done, nil objects will be returned on the
 //     currently blocked and every further NextObject calls.
 func (o *ObjSelector) NextObject() *ObjectInfo {
-	if o.kind == SelectorOneshot {
-		return <-o.objChan
-	}
-
-	select {
-	case <-time.After(nextObjectTimeout):
-		return nil
-	case obj := <-o.objChan:
-		return obj
-	}
+	return <-o.objChan
 }
 
 // Count returns total number of objects that match filter of the selector.

scenarios/s3_dar.js

@@ -71,23 +71,11 @@ if (write_vu_count > 0) {
     };
 }
 
-const read_vu_count = parseInt(__ENV.READERS || '0');
-if (read_vu_count > 0) {
-    scenarios.read = {
-        executor : 'constant-vus',
-        vus : read_vu_count,
-        duration : `${duration}s`,
-        exec : 'obj_read',
-        gracefulStop : '5s',
-    };
-}
-
 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 ) {
-    obj_to_delete_exit_on_null = (write_vu_count == 0) && (read_vu_count == 0)
+if (registry_enabled && delete_age) {
+    obj_to_delete_exit_on_null = write_vu_count == 0;
 
     let constructor = obj_to_delete_exit_on_null ? registry.getOneshotSelector
         : registry.getSelector;
@@ -100,7 +88,16 @@ if (registry_enabled ) {
             });
 }
 
-
+const read_vu_count = parseInt(__ENV.READERS || '0');
+if (read_vu_count > 0) {
+    scenarios.read = {
+        executor : 'constant-vus',
+        vus : read_vu_count,
+        duration : `${duration}s`,
+        exec : 'obj_read',
+        gracefulStop : '5s',
+    };
+}
 
 const delete_vu_count = parseInt(__ENV.DELETERS || '0');
 if (delete_vu_count > 0) {
@@ -165,12 +162,11 @@ export function obj_write() {
     const payload = generator.genPayload();
     const resp = s3_client.put(bucket, key, payload);
     if (!resp.success) {
-        log.withFields({bucket : bucket, key : key, op: "write"}).error(resp.error);
+        log.withFields({bucket : bucket, key : key}).error(resp.error);
         return;
     }
 
     if (obj_registry) {
-        log.withFields({bucket : bucket, key : key, op: "write"}).info("add to registry");
         obj_registry.addObject('', '', bucket, key, payload.hash());
     }
 }
@@ -190,7 +186,6 @@ export function obj_read() {
             log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, status: obj.status, op: `READ`})
                 .error(resp.error);
         } else {
-            log.withFields({bucket : obj.s3_bucket, key :  obj.s3_key, op: "read"}).info("set read status");
             obj_registry.setObjectStatus(obj.id, obj.status, 'read');
         }
 
@@ -230,6 +225,6 @@ export function delete_object(obj) {
             .error(resp.error);
         return;
     }
-    log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op: "delete"}).info("delete from registry");
+
     obj_registry.deleteObject(obj.id);
 }