You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/08/11 23:55:08 UTC
[brooklyn-server] 09/09: allow batch config read to take a few millis, but not block
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 562fc4e1d29021fcd044fb6e561f46cab96fd9f1
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Fri Aug 12 00:51:43 2022 +0100
allow batch config read to take a few millis, but not block
---
.../org/apache/brooklyn/rest/resources/EntityConfigResource.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java
index 445dda3e3c..fe46aa8a6e 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java
@@ -140,7 +140,10 @@ public class EntityConfigResource extends AbstractBrooklynRestResource implement
.skipResolution(skipResolution)
.suppressIfSecret(key.getName(), suppressSecrets)
.raw(raw)
- .context(entity).timeout(Duration.ZERO).renderAs(key)
+ .context(entity)
+ .immediately(true) // 2022-08 added immediately instead of timeout zero because the latter caused some oddities
+ .timeout(Duration.millis(500)) // shouldn't take this long, but if it does, under load, just bail
+ .renderAs(key)
.resolve());
}