From 3d1400375db65bd147819849b7dea2f53cdeaca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Drumi=C5=84ski?= Date: Wed, 14 Jul 2021 11:24:40 +0200 Subject: [PATCH] Configurable request timeout in subscription view. Addidtionaly set default value to 'false' for store offline property in topic view. (#1353) --- .../subscription/SubscriptionFactory.js | 3 +- .../static/js/console/topic/TopicFactory.js | 1 + .../partials/modal/editSubscription.html | 15 +++++- .../static/partials/subscription.html | 4 ++ .../config/console/ConsoleProperties.java | 48 +++++++++++++++++++ .../src/main/resources/application.yaml | 5 ++ .../main/resources/console/config-local.json | 1 + .../resources/console/config-vagrant.json | 9 ++++ 8 files changed, 83 insertions(+), 3 deletions(-) diff --git a/hermes-console/static/js/console/subscription/SubscriptionFactory.js b/hermes-console/static/js/console/subscription/SubscriptionFactory.js index 919887941d..0f3bea3699 100644 --- a/hermes-console/static/js/console/subscription/SubscriptionFactory.js +++ b/hermes-console/static/js/console/subscription/SubscriptionFactory.js @@ -22,7 +22,8 @@ subscriptions.factory('SubscriptionFactory', ['SUBSCRIPTION_CONFIG', function (s messageBackoff: 1000, sendingDelay: 0, backoffMultiplier: 1.0, - backoffMaxIntervalInSec: 600 + backoffMaxIntervalInSec: 600, + requestTimeout: 1000 }, monitoringDetails: { severity: 'NON_IMPORTANT', diff --git a/hermes-console/static/js/console/topic/TopicFactory.js b/hermes-console/static/js/console/topic/TopicFactory.js index 752d3242c2..6d98f3b4ec 100644 --- a/hermes-console/static/js/console/topic/TopicFactory.js +++ b/hermes-console/static/js/console/topic/TopicFactory.js @@ -17,6 +17,7 @@ topics.factory('TopicFactory', ['TOPIC_CONFIG', source: '' }, offlineStorage: { + enabled: false, retentionTime: { duration: 60 } diff --git a/hermes-console/static/partials/modal/editSubscription.html b/hermes-console/static/partials/modal/editSubscription.html index e5b76800d5..5a65d719c5 100644 --- a/hermes-console/static/partials/modal/editSubscription.html +++ b/hermes-console/static/partials/modal/editSubscription.html @@ -109,12 +109,23 @@

Edit: {{su -
+
- + milliseconds + ? +
+
+ High request timeout + Please consider lower value to comply with the fail-fast principle. + In some cases it is better to rethink the design of a subscriber rather than increase the timeout.
diff --git a/hermes-console/static/partials/subscription.html b/hermes-console/static/partials/subscription.html index 559c058ca1..0669cfeaec 100644 --- a/hermes-console/static/partials/subscription.html +++ b/hermes-console/static/partials/subscription.html @@ -145,6 +145,10 @@

Properties

Message TTL: {{subscription.subscriptionPolicy.messageTtl}} seconds

+

+ Request timeout: {{subscription.subscriptionPolicy.requestTimeout}} milliseconds + +

Message delivery tracking: {{ trackingModeName[subscription.trackingMode] }}

diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java index 40e33dff87..8b55ce1aed 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java @@ -426,6 +426,7 @@ public static final class DefaultTopicView { private String ack = "LEADER"; private String contentType = "JSON"; private RetentionTime retentionTime = new RetentionTime(); + private DefaultOfflineStorageView offlineStorage = new DefaultOfflineStorageView(); public String getAck() { return ack; @@ -450,6 +451,35 @@ public RetentionTime getRetentionTime() { public void setRetentionTime(RetentionTime retentionTime) { this.retentionTime = retentionTime; } + + public DefaultOfflineStorageView getOfflineStorage() { + return offlineStorage; + } + + public void setOfflineStorage(DefaultOfflineStorageView offlineStorage) { + this.offlineStorage = offlineStorage; + } + } + + public static final class DefaultOfflineStorageView { + private boolean enabled = false; + private RetentionTime retentionTime = new RetentionTime(); + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public RetentionTime getRetentionTime() { + return retentionTime; + } + + public void setRetentionTime(RetentionTime retentionTime) { + this.retentionTime = retentionTime; + } } public static final class RetentionTime { @@ -577,6 +607,7 @@ public static final class SubscriptionView { private Map endpointAddressResolverMetadata = new HashMap<>(); private boolean showHeadersFilter = false; private boolean showFixedHeaders = false; + private int requestTimeoutWarningThreshold = 1001; private DefaultSubscriptionView defaults = new DefaultSubscriptionView(); private List deliveryTypes = Lists.newArrayList( new SubscriptionDeliveryType("SERIAL", "SERIAL"), @@ -622,6 +653,14 @@ public boolean isShowFixedHeaders() { public void setShowFixedHeaders(boolean showFixedHeaders) { this.showFixedHeaders = showFixedHeaders; } + + public int getRequestTimeoutWarningThreshold() { + return requestTimeoutWarningThreshold; + } + + public void setRequestTimeoutWarningThreshold(int requestTimeoutWarningThreshold) { + this.requestTimeoutWarningThreshold = requestTimeoutWarningThreshold; + } } public static final class GroupView { @@ -689,6 +728,7 @@ public void setDeliveryType(String deliveryType) { public static final class SubscriptionPolicy { private int messageTtl = 3600; + private int requestTimeout = 1000; public int getMessageTtl() { return messageTtl; @@ -697,6 +737,14 @@ public int getMessageTtl() { public void setMessageTtl(int messageTtl) { this.messageTtl = messageTtl; } + + public int getRequestTimeout() { + return requestTimeout; + } + + public void setRequestTimeout(int requestTimeout) { + this.requestTimeout = requestTimeout; + } } public static final class SubscriptionDeliveryType { diff --git a/hermes-management/src/main/resources/application.yaml b/hermes-management/src/main/resources/application.yaml index 3feaa3c73d..a9739b0a1b 100644 --- a/hermes-management/src/main/resources/application.yaml +++ b/hermes-management/src/main/resources/application.yaml @@ -61,6 +61,11 @@ console: label: Hours - value: TimeUnit.DAYS label: Days + defaults: + offlineStorage: + retentionTime: + duration: 60 + subscription: showHeadersFilter: false showFixedHeaders: false diff --git a/hermes-management/src/main/resources/console/config-local.json b/hermes-management/src/main/resources/console/config-local.json index efc3fe9eba..89ad7beafc 100644 --- a/hermes-management/src/main/resources/console/config-local.json +++ b/hermes-management/src/main/resources/console/config-local.json @@ -40,6 +40,7 @@ "subscription": { "showHeadersFilter": false, "showFixedHeaders": false, + "requestTimeoutWarningThreshold": 1001, "deliveryTypes": [ {"value": "SERIAL", "label": "SERIAL"}, {"value": "BATCH", "label": "BATCH"} diff --git a/hermes-management/src/main/resources/console/config-vagrant.json b/hermes-management/src/main/resources/console/config-vagrant.json index 4101307d80..2994a66a89 100644 --- a/hermes-management/src/main/resources/console/config-vagrant.json +++ b/hermes-management/src/main/resources/console/config-vagrant.json @@ -36,5 +36,14 @@ "topic": { "messagePreviewEnabled": true, "offlineClientsEnabled": false + }, + "subscription": { + "showHeadersFilter": false, + "showFixedHeaders": false, + "requestTimeoutWarningThreshold": 1001, + "deliveryTypes": [ + {"value": "SERIAL", "label": "SERIAL"}, + {"value": "BATCH", "label": "BATCH"} + ] } }