You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2018/05/31 16:03:55 UTC
[ambari] branch trunk updated: AMBARI-23980. Agent can send too
large websocket message with command output. (mpapirkovskyy) (#1427)
This is an automated email from the ASF dual-hosted git repository.
mpapirkovskyy pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8d36d51 AMBARI-23980. Agent can send too large websocket message with command output. (mpapirkovskyy) (#1427)
8d36d51 is described below
commit 8d36d51ccd90eb13fa0ef1f1ae4b97a24acfd863
Author: Myroslav Papirkovskyi <mp...@apache.org>
AuthorDate: Thu May 31 19:03:48 2018 +0300
AMBARI-23980. Agent can send too large websocket message with command output. (mpapirkovskyy) (#1427)
---
.../apache/ambari/server/agent/stomp/AgentClusterDataHolder.java | 5 +++++
.../java/org/apache/ambari/server/configuration/Configuration.java | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java
index d4d3e6b..e5f49e1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java
@@ -76,6 +76,11 @@ public abstract class AgentClusterDataHolder<T extends STOMPEvent & Hashable> ex
regenerateHash();
update.setHash(getData().getHash());
STOMPUpdatePublisher.publish(update);
+ } else {
+ // in case update does not have changes empty identifiers should be populated anyway
+ if (!isIdentifierValid(data)) {
+ regenerateHash();
+ }
}
return changed;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index d9ffe24..cc0042f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -5174,7 +5174,12 @@ public class Configuration {
}
public Boolean getGplLicenseAccepted(){
- return Boolean.valueOf(getProperty(GPL_LICENSE_ACCEPTED));
+ Properties actualProps = readConfigFile();
+ String defaultGPLAcceptedValue = null;
+ if (null != GPL_LICENSE_ACCEPTED.getDefaultValue()) {
+ defaultGPLAcceptedValue = String.valueOf(GPL_LICENSE_ACCEPTED.getDefaultValue());
+ }
+ return Boolean.valueOf(actualProps.getProperty(GPL_LICENSE_ACCEPTED.getKey(), defaultGPLAcceptedValue));
}
public String getAgentStackRetryOnInstallCount(){
--
To stop receiving notification emails like this one, please contact
mpapirkovskyy@apache.org.