简柏林 / thingskit · Commits

Commit 26a200dcfb1b610be6091b34edf7e76694ec8a3b

Authored by Andrii Shvaika
1 parent 0103da1b

Renaming the queues

Inline Side-by-side
Showing 3 changed files with 20 additions and 5 deletions
... ... @@ -43,7 +43,7 @@ public class QueueController extends BaseController {
43 43 ServiceType type = ServiceType.valueOf(serviceType);
44 44 switch (type) {
45 45 case TB_RULE_ENGINE:
46   - return Arrays.asList("HighPriority", "Main");
  46 + return Arrays.asList("Main", "HighPriority", "SequentialByOriginator");
47 47 default:
48 48 return Collections.emptyList();
49 49 }
... ...
... ... @@ -29,9 +29,9 @@ public class TbRuleEngineSubmitStrategyFactory {
29 29 return new BurstTbRuleEngineSubmitStrategy(name);
30 30 case "BATCH":
31 31 return new BatchTbRuleEngineSubmitStrategy(name, configuration.getBatchSize());
32   - case "SEQUENTIAL_WITHIN_ORIGINATOR":
  32 + case "SEQUENTIAL_BY_ORIGINATOR":
33 33 return new SequentialByOriginatorIdTbRuleEngineSubmitStrategy(name);
34   - case "SEQUENTIAL_WITHIN_TENANT":
  34 + case "SEQUENTIAL_BY_TENANT":
35 35 return new SequentialByTenantIdTbRuleEngineSubmitStrategy(name);
36 36 case "SEQUENTIAL":
37 37 return new SequentialTbRuleEngineSubmitStrategy(name);
... ...
... ... @@ -618,7 +618,7 @@ queue:
618 618 partitions: "${TB_QUEUE_RE_MAIN_PARTITIONS:10}"
619 619 pack-processing-timeout: "${TB_QUEUE_RE_MAIN_PACK_PROCESSING_TIMEOUT_MS:60000}"
620 620 submit-strategy:
621   - type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_WITHIN_ORIGINATOR, SEQUENTIAL_WITHIN_TENANT, SEQUENTIAL
  621 + type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
622 622 # For BATCH only
623 623 batch-size: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_BATCH_SIZE:1000}" # Maximum number of messages in batch
624 624 processing-strategy:
... ... @@ -633,7 +633,7 @@ queue:
633 633 partitions: "${TB_QUEUE_RE_HP_PARTITIONS:3}"
634 634 pack-processing-timeout: "${TB_QUEUE_RE_HP_PACK_PROCESSING_TIMEOUT_MS:60000}"
635 635 submit-strategy:
636   - type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_WITHIN_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_WITHIN_ORIGINATOR, SEQUENTIAL_WITHIN_TENANT, SEQUENTIAL
  636 + type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
637 637 # For BATCH only
638 638 batch-size: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_BATCH_SIZE:100}" # Maximum number of messages in batch
639 639 processing-strategy:
... ... @@ -642,6 +642,21 @@ queue:
642 642 retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRIES:0}" # Number of retries, 0 is unlimited
643 643 failure-percentage: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
644 644 pause-between-retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
  645 + - name: "${TB_QUEUE_RE_SQ_QUEUE_NAME:SequentialByOriginator}"
  646 + topic: "${TB_QUEUE_RE_SQ_TOPIC:tb_rule_engine.hp}"
  647 + poll-interval: "${TB_QUEUE_RE_SQ_POLL_INTERVAL_MS:25}"
  648 + partitions: "${TB_QUEUE_RE_SQ_PARTITIONS:3}"
  649 + pack-processing-timeout: "${TB_QUEUE_RE_SQ_PACK_PROCESSING_TIMEOUT_MS:60000}"
  650 + submit-strategy:
  651 + type: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_BY_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
  652 + # For BATCH only
  653 + batch-size: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_BATCH_SIZE:100}" # Maximum number of messages in batch
  654 + processing-strategy:
  655 + type: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_TYPE:RETRY_FAILED_AND_TIMED_OUT}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
  656 + # For RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
  657 + retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
  658 + failure-percentage: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
  659 + pause-between-retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
645 660 transport:
646 661 # For high priority notifications that require minimum latency and processing time
647 662 notifications_topic: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_TOPIC:tb_transport.notifications}"
... ...