commit 562fc4e1d29021fcd044fb6e561f46cab96fd9f1
author Alex Heneveld <alex@cloudsoft.io> Fri Aug 12 00:51:43 2022 +0100
committer Alex Heneveld <alex@cloudsoft.io> Fri Aug 12 00:51:43 2022 +0100
tree e2c81de82110c914ceac98d5b8530ebfe8ebe032
parent 613bd023bd65d5e74fc0fc33ea82b8e3263ae5f3

allow batch config read to take a few millis, but not block

rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java

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 445dda3..fe46aa8 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 @@
                                     .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());
 
             }