This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push: new e6deb33 ATLAS-3071: renamed stats key for backend/index stores stats - #2 e6deb33 is described below commit e6deb3378dfb19371f42077c7520187f75e61564 Author: Madhan Neethiraj <mad...@apache.org> AuthorDate: Thu Apr 11 17:42:24 2019 -0700 ATLAS-3071: renamed stats key for backend/index stores stats - #2 --- .../main/java/org/apache/atlas/model/metrics/AtlasMetrics.java | 4 ++-- .../src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java b/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java index 6f7c914..c011ad9 100644 --- a/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java +++ b/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java @@ -40,8 +40,6 @@ public class AtlasMetrics { public static final String PREFIX_NOTIFICATION = "Notification:"; public static final String PREFIX_SERVER = "Server:"; - public static final String STAT_CONNECTION_STATUS_BACKEND_STORE = PREFIX_CONNECTION_STATUS + "backendStore"; - public static final String STAT_CONNECTION_STATUS_INDEX_STORE = PREFIX_CONNECTION_STATUS + "indexStore"; public static final String STAT_NOTIFY_COUNT_CURR_DAY = PREFIX_NOTIFICATION + "currentDay"; public static final String STAT_NOTIFY_AVG_TIME_CURR_DAY = PREFIX_NOTIFICATION + "currentDayAvgTime"; public static final String STAT_NOTIFY_CREATES_COUNT_CURR_DAY = PREFIX_NOTIFICATION + "currentDayEntityCreates"; @@ -79,6 +77,8 @@ public class AtlasMetrics { public static final String STAT_NOTIFY_FAILED_COUNT_TOTAL = PREFIX_NOTIFICATION + "totalFailed"; public static final String STAT_SERVER_ACTIVE_TIMESTAMP = PREFIX_SERVER + "activeTimeStamp"; public static final String STAT_SERVER_START_TIMESTAMP = PREFIX_SERVER + "startTimeStamp"; + public static final String STAT_SERVER_STATUS_BACKEND_STORE = PREFIX_SERVER + "statusBackendStore"; + public static final String STAT_SERVER_STATUS_INDEX_STORE = PREFIX_SERVER + "statusIndexStore"; public static final String STAT_SERVER_UP_TIME = PREFIX_SERVER + "upTime"; private Map<String, Map<String, Object>> data; diff --git a/repository/src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java b/repository/src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java index c41e6bd..0c86aff 100644 --- a/repository/src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java +++ b/repository/src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java @@ -112,8 +112,9 @@ public class AtlasMetricsUtil { ret.put(STAT_SERVER_START_TIMESTAMP, serverStartTime); ret.put(STAT_SERVER_ACTIVE_TIMESTAMP, serverActiveTime); ret.put(STAT_SERVER_UP_TIME, millisToTimeDiff(System.currentTimeMillis() - serverStartTime)); - ret.put(STAT_CONNECTION_STATUS_BACKEND_STORE, getHBaseStatus() ? STATUS_CONNECTED : STATUS_NOT_CONNECTED); - ret.put(STAT_CONNECTION_STATUS_INDEX_STORE, getSolrStatus() ? STATUS_CONNECTED : STATUS_NOT_CONNECTED); + ret.put(STAT_SERVER_STATUS_BACKEND_STORE, getBackendStoreStatus() ? STATUS_CONNECTED : STATUS_NOT_CONNECTED); + ret.put(STAT_SERVER_STATUS_INDEX_STORE, getIndexStoreStatus() ? STATUS_CONNECTED : STATUS_NOT_CONNECTED); + ret.put(STAT_NOTIFY_START_OFFSET, msgOffsetStart); ret.put(STAT_NOTIFY_CURRENT_OFFSET, msgOffsetCurrent); ret.put(STAT_NOTIFY_LAST_MESSAGE_PROCESSED_TIME, this.messagesProcessed.getLastIncrTime().toEpochMilli()); @@ -158,7 +159,7 @@ public class AtlasMetricsUtil { return ret; } - private boolean getHBaseStatus(){ + private boolean getBackendStoreStatus(){ try { runWithTimeout(new Runnable() { @Override @@ -174,7 +175,7 @@ public class AtlasMetricsUtil { return true; } - private boolean getSolrStatus(){ + private boolean getIndexStoreStatus(){ final String query = AtlasGraphUtilsV2.getIndexSearchPrefix() + "\"" + Constants.TYPE_NAME_PROPERTY_KEY + "\":(" + TYPE_NAME_INTERNAL + ")"; try {