ambari git commit: AMBARI-18492 Clusters With Many Hosts Can Create Alerts With Text Too Large To Be Stored (dsen)

[ds...@apache.org]

Repository: ambari
Updated Branches:
  refs/heads/trunk 113d51e15 -> 324107d1b


AMBARI-18492 Clusters With Many Hosts Can Create Alerts With Text Too Large To Be Stored (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/324107d1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/324107d1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/324107d1

Branch: refs/heads/trunk
Commit: 324107d1b5783ac971a14a8f1fe920a98aaff298
Parents: 113d51e
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Sep 30 15:42:52 2016 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Sep 30 15:42:52 2016 +0300

----------------------------------------------------------------------
 .../org/apache/ambari/server/state/Alert.java   |  7 ++-
 .../apache/ambari/server/state/AlertTest.java   | 53 ++++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/324107d1/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java
index 8252e0d..f6d5557 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java
@@ -17,6 +17,7 @@
  */
 package org.apache.ambari.server.state;
 
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.jackson.annotate.JsonProperty;
 /**
  * An alert represents a problem or notice for a cluster.
@@ -33,6 +34,9 @@ public class Alert {
   private String text = null;
   private long timestamp = 0L;
 
+  // Maximum string size for MySql TEXT (utf8) column data type
+  protected final static int MAX_ALERT_TEXT_SIZE = 32617;
+
 
   /**
    * Constructor.
@@ -127,7 +131,8 @@ public class Alert {
    */
   @JsonProperty("text")
   public void setText(String alertText) {
-    text = alertText;
+    // middle-ellipsize the text to reduce the size to 32617 characters
+    text = StringUtils.abbreviateMiddle(alertText, "\u2026", MAX_ALERT_TEXT_SIZE);
   }
 
   @JsonProperty("instance")

http://git-wip-us.apache.org/repos/asf/ambari/blob/324107d1/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java
new file mode 100644
index 0000000..4a04818
--- /dev/null
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.state;
+
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests {@link Alert}.
+ */
+public class AlertTest extends Alert{
+
+  @Test
+  public void testSetTextMiddleEllipsizing() throws Exception {
+    Alert alert = new Alert();
+
+    String shortText = "Short alert text";
+    String longText = "Not so short" + new String(new char[MAX_ALERT_TEXT_SIZE]) + "alert text";
+
+    // Normal alert text
+    alert.setText(shortText);
+    assertEquals(shortText.length(), alert.getText().length());
+    assertEquals(shortText, alert.getText());
+
+    //Toooo long alert text
+    alert.setText(longText);
+    assertFalse(shortText.length() == alert.getText().length());
+    assertEquals(MAX_ALERT_TEXT_SIZE, alert.getText().length());
+    assertTrue(alert.getText().startsWith("Not so short"));
+    assertTrue(alert.getText().endsWith("alert text"));
+    assertTrue(alert.getText().contains("\u2026"));
+  }
+}