Merge branch 'agresch_rocksdb' of https://github.com/agresch/storm into STORM-2887-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e6a423dd Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e6a423dd Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e6a423dd Branch: refs/heads/master Commit: e6a423dd8cada12997e2a9448a9944050cf23a1f Parents: 879cb5b 48e23a9 Author: Jungtaek Lim <[email protected]> Authored: Tue Jan 23 06:23:11 2018 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Jan 23 06:23:11 2018 +0900 ---------------------------------------------------------------------- conf/defaults.yaml | 6 + docs/index.md | 1 + docs/storm-metricstore.md | 83 ++ pom.xml | 9 + .../org/apache/storm/generated/Assignment.java | 288 +++--- .../storm/generated/ClusterWorkerHeartbeat.java | 52 +- .../jvm/org/apache/storm/generated/HBNodes.java | 32 +- .../org/apache/storm/generated/HBRecords.java | 36 +- .../storm/generated/LSApprovedWorkers.java | 44 +- .../generated/LSSupervisorAssignments.java | 48 +- .../apache/storm/generated/LSTopoHistory.java | 64 +- .../storm/generated/LSTopoHistoryList.java | 36 +- .../storm/generated/LSWorkerHeartbeat.java | 36 +- .../apache/storm/generated/LocalAssignment.java | 36 +- .../apache/storm/generated/LocalStateData.java | 48 +- .../org/apache/storm/generated/LogConfig.java | 48 +- .../jvm/org/apache/storm/generated/Nimbus.java | 809 ++++++++++++++++- .../org/apache/storm/generated/StormBase.java | 92 +- .../storm/generated/TopologyHistoryInfo.java | 32 +- .../storm/generated/WorkerMetricList.java | 466 ++++++++++ .../storm/generated/WorkerMetricPoint.java | 903 +++++++++++++++++++ .../apache/storm/generated/WorkerMetrics.java | 712 +++++++++++++++ .../apache/storm/generated/WorkerResources.java | 88 +- .../auth/authorizer/SimpleACLAuthorizer.java | 24 +- .../jvm/org/apache/storm/utils/ConfigUtils.java | 4 +- .../src/jvm/org/apache/storm/utils/Utils.java | 14 +- storm-client/src/py/storm/Nimbus-remote | 7 + storm-client/src/py/storm/Nimbus.py | 196 +++- storm-client/src/py/storm/ttypes.py | 715 +++++++++++---- storm-client/src/storm.thrift | 23 + storm-server/pom.xml | 4 + .../java/org/apache/storm/DaemonConfig.java | 59 +- .../java/org/apache/storm/LocalCluster.java | 8 +- .../org/apache/storm/daemon/nimbus/Nimbus.java | 66 +- .../storm/daemon/supervisor/Container.java | 61 +- .../apache/storm/daemon/supervisor/Slot.java | 3 + .../storm/metric/StormMetricsRegistry.java | 5 + .../org/apache/storm/metricstore/AggLevel.java | 40 + .../apache/storm/metricstore/FilterOptions.java | 154 ++++ .../org/apache/storm/metricstore/Metric.java | 270 ++++++ .../storm/metricstore/MetricException.java | 32 + .../apache/storm/metricstore/MetricStore.java | 74 ++ .../storm/metricstore/MetricStoreConfig.java | 45 + .../storm/metricstore/rocksdb/KeyType.java | 70 ++ .../metricstore/rocksdb/MetricsCleaner.java | 98 ++ .../rocksdb/ReadOnlyStringMetadataCache.java | 52 ++ .../storm/metricstore/rocksdb/RocksDbKey.java | 228 +++++ .../rocksdb/RocksDbMetricsWriter.java | 320 +++++++ .../storm/metricstore/rocksdb/RocksDbStore.java | 639 +++++++++++++ .../storm/metricstore/rocksdb/RocksDbValue.java | 144 +++ .../metricstore/rocksdb/StringMetadata.java | 78 ++ .../rocksdb/StringMetadataCache.java | 202 +++++ .../rocksdb/WritableStringMetadataCache.java | 54 ++ .../java/org/apache/storm/utils/LruMap.java | 56 ++ .../metricstore/rocksdb/RocksDbKeyTest.java | 74 ++ .../metricstore/rocksdb/RocksDbStoreTest.java | 328 +++++++ .../metricstore/rocksdb/RocksDbValueTest.java | 76 ++ .../rocksdb/StringMetadataCacheTest.java | 129 +++ 58 files changed, 7571 insertions(+), 750 deletions(-) ----------------------------------------------------------------------
