Skip to content

A
atlas
Commit d6fe41d4 by nikhilbonte Committed by Sarath Subramanian
Options

ATLAS-3017: Add Atlas server statistics rest endpoint #renaming fields

Signed-off-by: 's avatarSarath Subramanian <ssubramanian@hortonworks.com>
parent 3e4fb5cd
Showing with 35 additions and 14 deletions
intg/src/main/java/org/apache/atlas/model/AtlasStatistics.java
...@@ -35,15 +35,16 @@ import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ ...@@ -35,15 +35,16 @@ import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_
@JsonSerialize(include = JsonSerialize.Inclusion.ALWAYS) @JsonSerialize(include = JsonSerialize.Inclusion.ALWAYS)
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class AtlasStatistics { public class AtlasStatistics {
public static final String STAT_SERVER_START_TS = "serverStartTimeStamp"; public static final String STAT_SERVER_START_TS = "Server:upFrom";
public static final String STAT_SERVER_ACTIVE_TS = "serverActiveTimeStamp"; public static final String STAT_SERVER_ACTIVE_TS = "Server:activateFrom";
public static final String STAT_SERVER_UP_SINCE = "serverUpTime"; public static final String STAT_SERVER_UP_SINCE = "Server:upTime";
public static final String STAT_START_OFFSET = "KafkaTopic:ATLAS_HOOK:startOffset"; public static final String STAT_START_OFFSET = "Notification:ATLAS_HOOK:offsetStart";
public static final String STAT_CURRENT_OFFSET = "KafkaTopic:ATLAS_HOOK:currentOffset"; public static final String STAT_CURRENT_OFFSET = "Notification:ATLAS_HOOK:offsetCurrent";
public static final String STAT_SOLR_STATUS = "solrConnectionStatus"; public static final String STAT_SOLR_STATUS = "ConnectionStatus:Solr";
public static final String STAT_HBASE_STATUS = "HBaseConnectionStatus"; public static final String STAT_HBASE_STATUS = "ConnectionStatus:HBase";
public static final String STAT_LAST_MESSAGE_PROCESSED_TIME_TS = "lastMessageProcessedTimeStamp"; public static final String STAT_LAST_MESSAGE_PROCESSED_TIME_TS = "Notification:ATLAS_HOOK:messageLastProcessedAt";
public static final String STAT_AVG_MESSAGE_PROCESSING_TIME = "avgMessageProcessingTime"; public static final String STAT_AVG_MESSAGE_PROCESSING_TIME = "Notification:ATLAS_HOOK:messageAvgProcessingDuration";
public static final String STAT_MESSAGES_CONSUMED = "Notification:ATLAS_HOOK:messagesConsumed";
private Map<String, Object> data = new HashMap<>(); private Map<String, Object> data = new HashMap<>();
......
repository/src/main/java/org/apache/atlas/util/StatisticsUtil.java
...@@ -28,9 +28,11 @@ import org.slf4j.LoggerFactory; ...@@ -28,9 +28,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.inject.Inject; import javax.inject.Inject;
import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Locale;
import java.util.concurrent.*; import java.util.concurrent.*;
import static org.apache.atlas.model.AtlasStatistics.STAT_SERVER_START_TS; import static org.apache.atlas.model.AtlasStatistics.STAT_SERVER_START_TS;
...@@ -42,6 +44,7 @@ import static org.apache.atlas.model.AtlasStatistics.STAT_SOLR_STATUS; ...@@ -42,6 +44,7 @@ import static org.apache.atlas.model.AtlasStatistics.STAT_SOLR_STATUS;
import static org.apache.atlas.model.AtlasStatistics.STAT_HBASE_STATUS; import static org.apache.atlas.model.AtlasStatistics.STAT_HBASE_STATUS;
import static org.apache.atlas.model.AtlasStatistics.STAT_LAST_MESSAGE_PROCESSED_TIME_TS; import static org.apache.atlas.model.AtlasStatistics.STAT_LAST_MESSAGE_PROCESSED_TIME_TS;
import static org.apache.atlas.model.AtlasStatistics.STAT_AVG_MESSAGE_PROCESSING_TIME; import static org.apache.atlas.model.AtlasStatistics.STAT_AVG_MESSAGE_PROCESSING_TIME;
import static org.apache.atlas.model.AtlasStatistics.STAT_MESSAGES_CONSUMED;
@Component @Component
public class StatisticsUtil { public class StatisticsUtil {
...@@ -61,11 +64,14 @@ public class StatisticsUtil { ...@@ -61,11 +64,14 @@ public class StatisticsUtil {
private long countMsgProcessed = 0; private long countMsgProcessed = 0;
private long totalMsgProcessingTimeMs = 0; private long totalMsgProcessingTimeMs = 0;
private Locale locale = new Locale("en", "US");
private NumberFormat numberFormat;
@Inject @Inject
public StatisticsUtil(AtlasGraph graph) { public StatisticsUtil(AtlasGraph graph) {
this.graph = graph; this.graph = graph;
this.atlasStatistics = new AtlasStatistics(); this.atlasStatistics = new AtlasStatistics();
numberFormat = NumberFormat.getInstance(locale);
} }
public Map<String, Object> getAtlasStatistics() { public Map<String, Object> getAtlasStatistics() {
...@@ -73,14 +79,17 @@ public class StatisticsUtil { ...@@ -73,14 +79,17 @@ public class StatisticsUtil {
statisticsMap.putAll(atlasStatistics.getData()); statisticsMap.putAll(atlasStatistics.getData());
statisticsMap.put(STAT_HBASE_STATUS, getHBaseStatus()); statisticsMap.put(STAT_HBASE_STATUS, getHBaseStatus());
statisticsMap.put(STAT_SOLR_STATUS , getSolrStatus()); statisticsMap.put(STAT_SOLR_STATUS, getSolrStatus());
statisticsMap.put(STAT_SERVER_UP_SINCE, getUpSinceTime()); statisticsMap.put(STAT_SERVER_UP_SINCE, getUpSinceTime());
if(countMsgProcessed > 0) {
statisticsMap.put(STAT_MESSAGES_CONSUMED, countMsgProcessed);
}
formatStatistics(statisticsMap); formatStatistics(statisticsMap);
return statisticsMap; return statisticsMap;
} }
public void setKafkaOffsets(long value){ public void setKafkaOffsets(long value) {
if (Long.parseLong(getStat(STAT_START_OFFSET).toString()) == -1) { if (Long.parseLong(getStat(STAT_START_OFFSET).toString()) == -1) {
addStat(STAT_START_OFFSET, value); addStat(STAT_START_OFFSET, value);
} }
...@@ -143,7 +152,7 @@ public class StatisticsUtil { ...@@ -143,7 +152,7 @@ public class StatisticsUtil {
break; break;
case STAT_AVG_MESSAGE_PROCESSING_TIME: case STAT_AVG_MESSAGE_PROCESSING_TIME:
statisticsMap.put(stat.getKey(), stat.getValue() + " milliseconds"); statisticsMap.put(stat.getKey(), formatNumber(Long.parseLong(stat.getValue().toString())) + " milliseconds");
break; break;
case STAT_HBASE_STATUS: case STAT_HBASE_STATUS:
...@@ -152,13 +161,19 @@ public class StatisticsUtil { ...@@ -152,13 +161,19 @@ public class StatisticsUtil {
statisticsMap.put(stat.getKey(), curState); statisticsMap.put(stat.getKey(), curState);
break; break;
case STAT_MESSAGES_CONSUMED:
case STAT_START_OFFSET:
case STAT_CURRENT_OFFSET:
statisticsMap.put(stat.getKey(), formatNumber(Long.parseLong(stat.getValue().toString())));
break;
default: default:
statisticsMap.put(stat.getKey(), stat.getValue()); statisticsMap.put(stat.getKey(), stat.getValue());
} }
} }
} }
private boolean getHBaseStatus(){ private boolean getHBaseStatus() {
String query = "g.V().next()"; String query = "g.V().next()";
try { try {
...@@ -180,7 +195,7 @@ public class StatisticsUtil { ...@@ -180,7 +195,7 @@ public class StatisticsUtil {
return true; return true;
} }
private boolean getSolrStatus(){ private boolean getSolrStatus() {
String query = AtlasGraphUtilsV2.getIndexSearchPrefix() + "\"" + "__type.name\"" + " : (*)"; String query = AtlasGraphUtilsV2.getIndexSearchPrefix() + "\"" + "__type.name\"" + " : (*)";
try { try {
runWithTimeout(new Runnable() { runWithTimeout(new Runnable() {
...@@ -251,4 +266,9 @@ public class StatisticsUtil { ...@@ -251,4 +266,9 @@ public class StatisticsUtil {
private String millisToTimeStamp(long ms) { private String millisToTimeStamp(long ms) {
return simpleDateFormat.format(ms); return simpleDateFormat.format(ms);
} }
private String formatNumber(long value) {
return numberFormat.format(value);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment