Browse Source

Increase default timeouts for Version control

pull/9089/head
ViacheslavKlimov 3 years ago
parent
commit
b457c5d19f
  1. 2
      application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java
  2. 6
      application/src/main/resources/thingsboard.yml
  3. 2
      common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
  4. 2
      msa/vc-executor/src/main/resources/tb-vc-executor.yml

2
application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java

@ -103,7 +103,7 @@ public class DefaultGitVersionControlQueueService implements GitVersionControlQu
private final Map<UUID, PendingGitRequest<?>> pendingRequestMap = new HashMap<>(); private final Map<UUID, PendingGitRequest<?>> pendingRequestMap = new HashMap<>();
private final Map<UUID, HashMap<Integer, String[]>> chunkedMsgs = new ConcurrentHashMap<>(); private final Map<UUID, HashMap<Integer, String[]>> chunkedMsgs = new ConcurrentHashMap<>();
@Value("${queue.vc.request-timeout:60000}") @Value("${queue.vc.request-timeout:180000}")
private int requestTimeout; private int requestTimeout;
@Value("${queue.vc.msg-chunk-size:500000}") @Value("${queue.vc.msg-chunk-size:500000}")
private int msgChunkSize; private int msgChunkSize;

6
application/src/main/resources/thingsboard.yml

@ -487,7 +487,7 @@ cache:
timeToLiveInMinutes: "${CACHE_SPECS_TWO_FA_VERIFICATION_CODES_TTL:60}" timeToLiveInMinutes: "${CACHE_SPECS_TWO_FA_VERIFICATION_CODES_TTL:60}"
maxSize: "${CACHE_SPECS_TWO_FA_VERIFICATION_CODES_MAX_SIZE:100000}" maxSize: "${CACHE_SPECS_TWO_FA_VERIFICATION_CODES_MAX_SIZE:100000}"
versionControlTask: versionControlTask:
timeToLiveInMinutes: "${CACHE_SPECS_VERSION_CONTROL_TASK_TTL:5}" timeToLiveInMinutes: "${CACHE_SPECS_VERSION_CONTROL_TASK_TTL:20}"
maxSize: "${CACHE_SPECS_VERSION_CONTROL_TASK_MAX_SIZE:100000}" maxSize: "${CACHE_SPECS_VERSION_CONTROL_TASK_MAX_SIZE:100000}"
userSettings: userSettings:
timeToLiveInMinutes: "${CACHE_SPECS_USER_SETTINGS_TTL:1440}" timeToLiveInMinutes: "${CACHE_SPECS_USER_SETTINGS_TTL:1440}"
@ -1160,8 +1160,8 @@ queue:
topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}" topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"
partitions: "${TB_QUEUE_VC_PARTITIONS:10}" partitions: "${TB_QUEUE_VC_PARTITIONS:10}"
poll-interval: "${TB_QUEUE_VC_INTERVAL_MS:25}" poll-interval: "${TB_QUEUE_VC_INTERVAL_MS:25}"
pack-processing-timeout: "${TB_QUEUE_VC_PACK_PROCESSING_TIMEOUT_MS:60000}" pack-processing-timeout: "${TB_QUEUE_VC_PACK_PROCESSING_TIMEOUT_MS:180000}"
request-timeout: "${TB_QUEUE_VC_REQUEST_TIMEOUT:60000}" request-timeout: "${TB_QUEUE_VC_REQUEST_TIMEOUT:180000}"
msg-chunk-size: "${TB_QUEUE_VC_MSG_CHUNK_SIZE:250000}" msg-chunk-size: "${TB_QUEUE_VC_MSG_CHUNK_SIZE:250000}"
js: js:
# JS Eval request topic # JS Eval request topic

2
common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java

@ -122,7 +122,7 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
@Value("${queue.vc.poll-interval:25}") @Value("${queue.vc.poll-interval:25}")
private long pollDuration; private long pollDuration;
@Value("${queue.vc.pack-processing-timeout:60000}") @Value("${queue.vc.pack-processing-timeout:180000}")
private long packProcessingTimeout; private long packProcessingTimeout;
@Value("${vc.git.io_pool_size:3}") @Value("${vc.git.io_pool_size:3}")
private int ioPoolSize; private int ioPoolSize;

2
msa/vc-executor/src/main/resources/tb-vc-executor.yml

@ -167,7 +167,7 @@ queue:
topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}" topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"
partitions: "${TB_QUEUE_VC_PARTITIONS:10}" partitions: "${TB_QUEUE_VC_PARTITIONS:10}"
poll-interval: "${TB_QUEUE_VC_INTERVAL_MS:25}" poll-interval: "${TB_QUEUE_VC_INTERVAL_MS:25}"
pack-processing-timeout: "${TB_QUEUE_VC_PACK_PROCESSING_TIMEOUT_MS:60000}" pack-processing-timeout: "${TB_QUEUE_VC_PACK_PROCESSING_TIMEOUT_MS:180000}"
msg-chunk-size: "${TB_QUEUE_VC_MSG_CHUNK_SIZE:250000}" msg-chunk-size: "${TB_QUEUE_VC_MSG_CHUNK_SIZE:250000}"
vc: vc:

Loading…
Cancel
Save