This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch wip/oshi-multios-stats-module in repository https://gitbox.apache.org/repos/asf/geode.git
commit fb2b8cf261ed9509cbba81ee70f5195fe8f0a8d9 Author: Jacob Barrett <[email protected]> AuthorDate: Fri Nov 19 11:42:30 2021 -0800 Initial module. --- .../internal/InternalDistributedSystem.java | 3 +-- ....geode.internal.statistics.OsStatisticsProvider | 1 - geode-stats-legacy/build.gradle | 31 ++++++++++++++++++++++ .../legacy/LinuxOsStatisticsProvider.java | 0 .../statistics/legacy/LinuxProcFsStatistics.java | 0 .../statistics/legacy/LinuxProcessStats.java | 0 .../statistics/legacy/LinuxSystemStats.java | 0 ....geode.internal.statistics.OsStatisticsProvider | 1 - settings.gradle | 1 + 9 files changed, 33 insertions(+), 4 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java index d051dc0..84e2225 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java @@ -105,7 +105,6 @@ import org.apache.geode.internal.statistics.StatisticsConfig; import org.apache.geode.internal.statistics.StatisticsManager; import org.apache.geode.internal.statistics.StatisticsManagerFactory; import org.apache.geode.internal.statistics.StatisticsRegistry; -import org.apache.geode.internal.statistics.legacy.LinuxProcFsStatistics; import org.apache.geode.internal.tcp.ConnectionTable; import org.apache.geode.logging.internal.LoggingSession; import org.apache.geode.logging.internal.NullLoggingSession; @@ -737,7 +736,7 @@ public class InternalDistributedSystem extends DistributedSystem // This calculation is not exact, but seems fairly close. So far we have // not loaded much into the heap and the current RSS usage is already // included the available memory calculation. - long avail = LinuxProcFsStatistics.getAvailableMemory(logger); + long avail = 0; //LinuxProcFsStatistics.getAvailableMemory(logger); long size = offHeapMemorySize + Runtime.getRuntime().totalMemory(); lockMemory(avail, size); } diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider index fa4cef5..4b59cde 100644 --- a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider +++ b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider @@ -13,5 +13,4 @@ # the License. # -org.apache.geode.internal.statistics.legacy.LinuxOsStatisticsProvider org.apache.geode.internal.statistics.oshi.OshiStatisticsProvider diff --git a/geode-stats-legacy/build.gradle b/geode-stats-legacy/build.gradle new file mode 100644 index 0000000..f8979ad --- /dev/null +++ b/geode-stats-legacy/build.gradle @@ -0,0 +1,31 @@ +/* + * 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. + */ + + +apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle" + + +apply from: "${project.projectDir}/../gradle/publish-java.gradle" +apply from: "${project.projectDir}/../gradle/warnings.gradle" + +dependencies { + api(platform(project(':boms:geode-all-bom'))) + + implementation(project(':geode-core')) + implementation(project(':geode-logging')) + + compileOnly('org.jetbrains:annotations') + +} diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxOsStatisticsProvider.java b/geode-stats-legacy/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxOsStatisticsProvider.java similarity index 100% rename from geode-core/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxOsStatisticsProvider.java rename to geode-stats-legacy/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxOsStatisticsProvider.java diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxProcFsStatistics.java b/geode-stats-legacy/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxProcFsStatistics.java similarity index 100% rename from geode-core/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxProcFsStatistics.java rename to geode-stats-legacy/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxProcFsStatistics.java diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxProcessStats.java b/geode-stats-legacy/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxProcessStats.java similarity index 100% rename from geode-core/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxProcessStats.java rename to geode-stats-legacy/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxProcessStats.java diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxSystemStats.java b/geode-stats-legacy/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxSystemStats.java similarity index 100% rename from geode-core/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxSystemStats.java rename to geode-stats-legacy/src/main/java/org/apache/geode/internal/statistics/legacy/LinuxSystemStats.java diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider b/geode-stats-legacy/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider similarity index 92% copy from geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider copy to geode-stats-legacy/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider index fa4cef5..a162efb 100644 --- a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider +++ b/geode-stats-legacy/src/main/resources/META-INF/services/org.apache.geode.internal.statistics.OsStatisticsProvider @@ -14,4 +14,3 @@ # org.apache.geode.internal.statistics.legacy.LinuxOsStatisticsProvider -org.apache.geode.internal.statistics.oshi.OshiStatisticsProvider diff --git a/settings.gradle b/settings.gradle index 817d8a9..4a11bd0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -52,6 +52,7 @@ include 'geode-for-redis' include 'geode-memcached' include 'geode-connectors' include 'geode-http-service' +include 'geode-stats-legacy' include 'extensions:geode-modules' include 'extensions:geode-modules-test' include 'extensions:geode-modules-tomcat7'
