Update consumers, tests stabilization

Signed-off-by: Valery Piashchynski <[email protected]>

2 files changed, 30 insertions, 117 deletions

diff --git a/tests/plugins/jobs/configs/.rr-jobs-init.yaml b/tests/plugins/jobs/configs/.rr-jobs-init.yaml
index e31e4441..550e55cc 100644
--- a/tests/plugins/jobs/configs/.rr-jobs-init.yaml
+++ b/tests/plugins/jobs/configs/.rr-jobs-init.yaml
@@ -9,11 +9,16 @@ server:
 amqp:
   addr: amqp://guest:guest@localhost:5672/
 
-  # beanstalk configuration
+# beanstalk configuration
+#
 beanstalk:
+  # beanstalk address
   addr: tcp://localhost:11300
+  # connect timeout
+  timeout: 10s
 
-  # amazon sqs configuration
+# amazon sqs configuration
+# General section
 sqs:
   key: api-key
   secret: api-secret
@@ -42,32 +47,47 @@ jobs:
     test-local:
       driver: ephemeral
       priority: 10
-      pipeline_size: 10000
+      prefetch: 10000
 
     test-local-2:
       driver: ephemeral
       priority: 1
-      pipeline_size: 10000
+      prefetch: 10000
 
     test-local-3:
       driver: ephemeral
       priority: 2
-      pipeline_size: 10000
+      prefetch: 10000
 
     test-1:
       driver: amqp
-      priority: 1
-      pipeline_size: 1000000
+      # QoS
+      prefetch: 1000000
+      # Queue name
       queue: test-1-queue
+      # Pipeline jobs priority, 1 - highest
+      priority: 1
+      # Exchange
       exchange: default
-      exclusive: false
+      # Exchange type: direct, topic, fanout
       exchange_type: direct
+      # Routing key for the queue
       routing_key: test
+      # Declare a queue exclusive at the exchange
+      exclusive: false
+      # When multiple is true, this delivery and all prior unacknowledged deliveries
+      # on the same channel will be acknowledged.  This is useful for batch processing
+      # of deliveries
+      multiple_ack: false
+      # When multiple is true, this delivery and all prior unacknowledged deliveries
+      # on the same channel will be acknowledged.  This is useful for batch processing
+      # of deliveries
+      requeue_on_fail: false
 
     test-2-amqp:
       driver: amqp
       priority: 2
-      pipeline_size: 100000
+      prefetch: 1000000
       queue: test-2-queue
       exchange: default
       exchange_type: direct
@@ -77,11 +97,10 @@ jobs:
       driver: beanstalk
       priority: 11
       tube: default
-      pipeline_size: 1000000
 
     test-3:
       driver: sqs
-      pipeline_size: 1000000
+      prefetch: 1000000
       queue: default
       attributes:
         MessageRetentionPeriod: 86400
diff --git a/tests/plugins/jobs/configs/.rr-jobs-test.yaml b/tests/plugins/jobs/configs/.rr-jobs-test.yaml
deleted file mode 100644
index 8213d72a..00000000
--- a/tests/plugins/jobs/configs/.rr-jobs-test.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-rpc:
-  listen: unix:///tmp/rr.sock
-
-server:
-  command: "php ../../client.php echo pipes"
-  relay: "pipes"
-  relay_timeout: "20s"
-
-amqp:
-  addr: amqp://guest:guest@localhost:5672/
-
-  # beanstalk configuration
-beanstalk:
-  addr: tcp://localhost:11300
-
-  # amazon sqs configuration
-sqs:
-  key: api-key
-  secret: api-secret
-  region: us-west-1
-  endpoint: http://localhost:9324
-  session_token: ""
-  ping_period: 10
-  attributes:
-    MessageRetentionPeriod: 86400
-
-logs:
-  level: info
-  encoding: console
-  mode: development
-
-jobs:
-  # num logical cores by default
-  num_pollers: 64
-  # 1mi by default
-  pipeline_size: 100000
-  # worker pool configuration
-  pool:
-    num_workers: 20
-    max_jobs: 0
-    allocate_timeout: 60s
-    destroy_timeout: 60s
-
-  # list of broker pipelines associated with endpoints
-  pipelines:
-#    test-local:
-#      driver: ephemeral
-#      priority: 10
-#      pipeline_size: 10000
-#
-#    test-local-2:
-#      driver: ephemeral
-#      priority: 1
-#      pipeline_size: 10000
-#
-#    test-local-3:
-#      driver: ephemeral
-#      priority: 2
-#      pipeline_size: 10000
-#
-#    test-1:
-#      driver: amqp
-#      priority: 1
-#      pipeline_size: 1000000
-#      queue: test-1-queue
-#      exchange: default
-#      exchange_type: direct
-#      routing_key: test
-#
-#    test-4:
-#      driver: amqp
-#      priority: 1
-#      pipeline_size: 1000000
-#      queue: test-1-queue
-#      exchange: default
-#      exchange_type: direct
-#      routing_key: test
-#
-#    test-2-amqp:
-#      driver: amqp
-#      priority: 2
-#      pipeline_size: 100000
-#      queue: test-2-queue
-#      exchange: default
-#      exchange_type: direct
-#      routing_key: test-2
-
-    test-2:
-      driver: beanstalk
-      priority: 11
-      tube: default
-      pipeline_size: 1000000
-      reserve_timeout: 10s
-
-#    test-3:
-#      driver: sqs
-#      pipeline_size: 1000000
-#      queue: default
-#      attributes:
-#        MessageRetentionPeriod: 86400
-#      tags:
-#        test: "tag"
-
-  # list of pipelines to be consumed by the server, keep empty if you want to start consuming manually
-  consume: [ "test-local", "test-local-2", "test-local-3", "test-1", "test-2-amqp", "test-3", "test-2" ]
-