You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kh...@apache.org on 2017/04/04 21:48:39 UTC
[5/5] geode git commit: GEODE-2420: Updates from review
GEODE-2420: Updates from review
Rewrote server startup and shutdown in SizeExportLogsFunctionCacheTest
to use rules that ensure clean cache server shutdown after each test.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c61cab97
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c61cab97
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c61cab97
Branch: refs/heads/develop
Commit: c61cab97cca37012888ecd2d385b6580413d05f8
Parents: 0c15c6e
Author: Ken Howe <kh...@pivotal.io>
Authored: Fri Mar 31 12:48:13 2017 -0700
Committer: Ken Howe <kh...@pivotal.io>
Committed: Tue Apr 4 14:47:13 2017 -0700
----------------------------------------------------------------------
.../cli/commands/ExportLogsCommand.java | 6 ++--
.../cli/functions/ExportedLogsSizeInfo.java | 8 ++---
.../cli/functions/ExportedLogsSizeInfoTest.java | 6 ++--
.../SizeExportLogsFunctionCacheTest.java | 31 ++++++++------------
4 files changed, 21 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/c61cab97/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
index 37cbd71..fe9cecd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
@@ -262,12 +262,12 @@ public class ExportLogsCommand implements CommandMarker {
}
switch (matcher.group(2).toLowerCase()) {
case "t":
- return (int) Math.pow(1024, 4);
+ return (int) TERABYTE;
case "g":
- return (int) Math.pow(1024, 3);
+ return (int) GIGABYTE;
case "m":
default:
- return (int) Math.pow(1024, 2);
+ return (int) MEGABYTE;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/c61cab97/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
index 6d56f12..575930b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
@@ -20,8 +20,9 @@ import org.apache.geode.DataSerializer;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.util.Objects;
-public class ExportedLogsSizeInfo implements DataSerializable {
+public final class ExportedLogsSizeInfo implements DataSerializable {
private long logsSize;
private long diskAvailable;
private long diskSize;
@@ -74,10 +75,7 @@ public class ExportedLogsSizeInfo implements DataSerializable {
@Override
public int hashCode() {
- int result = (int) (logsSize ^ (logsSize >>> 32));
- result = 31 * result + (int) (diskAvailable ^ (diskAvailable >>> 32));
- result = 31 * result + (int) (diskSize ^ (diskSize >>> 32));
- return result;
+ return Objects.hash(logsSize, diskAvailable, diskSize);
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/c61cab97/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java
index 017d70d..77a2453 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java
@@ -116,9 +116,9 @@ public class ExportedLogsSizeInfoTest {
assertThat(sizeDetail1.hashCode()).isNotEqualTo(sizeDetail3.hashCode());
assertThat(sizeDetail2.hashCode()).isNotEqualTo(sizeDetail3.hashCode());
- assertThat(sizeDetail1.hashCode()).isEqualTo(0);
- assertThat(sizeDetail2.hashCode()).isEqualTo(11304);
- assertThat(sizeDetail3.hashCode()).isEqualTo(85704);
+ assertThat(sizeDetail1.hashCode()).isEqualTo(29791);
+ assertThat(sizeDetail2.hashCode()).isEqualTo(41095);
+ assertThat(sizeDetail3.hashCode()).isEqualTo(115495);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/c61cab97/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionCacheTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionCacheTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionCacheTest.java
index 8de605f..d8f2f2d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionCacheTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionCacheTest.java
@@ -21,13 +21,12 @@ import static org.junit.Assert.assertTrue;
import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -61,6 +60,9 @@ public class SizeExportLogsFunctionCacheTest {
@Rule
public TestName testName = new TestName();
+ @Rule
+ public ServerStarterRule server = new ServerStarterRule();
+
@Before
public void before() throws Throwable {
name = testName.getMethodName();
@@ -74,24 +76,14 @@ public class SizeExportLogsFunctionCacheTest {
}
- @After
- public void after() throws Exception {
- if (this.cache != null) {
- this.cache.close();
- }
- FileUtils.deleteDirectory(dir);
- }
-
@Test
public void withFiles_returnsCombinedSizeResult() throws Throwable {
Properties config = new Properties();
config.setProperty(NAME, name);
- config.setProperty(LOCATORS, "");
- config.setProperty(MCAST_PORT, "0");
config.setProperty(LOG_FILE, logFile.getAbsolutePath());
config.setProperty(STATISTIC_ARCHIVE_FILE, statFile.getAbsolutePath());
- this.cache = new CacheFactory(config).create();
+ server.withProperties(config).startServer();
TestResultSender resultSender = new TestResultSender();
FunctionContext context = new FunctionContextImpl("functionId", nonFilteringArgs, resultSender);
@@ -107,10 +99,10 @@ public class SizeExportLogsFunctionCacheTest {
public void noFiles_returnsZeroResult() throws Throwable {
Properties config = new Properties();
config.setProperty(NAME, name);
- config.setProperty(LOCATORS, "");
- config.setProperty(MCAST_PORT, "0");
+ config.setProperty(LOG_FILE, "");
+ config.setProperty(STATISTIC_ARCHIVE_FILE, "");
- this.cache = new CacheFactory(config).create();
+ server.withProperties(config).startServer();
TestResultSender resultSender = new TestResultSender();
FunctionContext context = new FunctionContextImpl("functionId", nonFilteringArgs, resultSender);
@@ -132,6 +124,9 @@ public class SizeExportLogsFunctionCacheTest {
assertThat(results.size()).isEqualTo(1);
List<?> result = (List<?>) results.get(0);
assertThat(result).isNotNull();
+ if (minExpected == maxExpected) {
+ assertThat(((ExportedLogsSizeInfo) result.get(0)).getLogsSize()).isEqualTo(minExpected);
+ }
assertThat(((ExportedLogsSizeInfo) result.get(0)).getLogsSize())
.isGreaterThanOrEqualTo(minExpected).isLessThanOrEqualTo(maxExpected);
}
@@ -140,10 +135,8 @@ public class SizeExportLogsFunctionCacheTest {
public void withFunctionError_shouldThrow() throws Throwable {
Properties config = new Properties();
config.setProperty(NAME, name);
- config.setProperty(LOCATORS, "");
- config.setProperty(MCAST_PORT, "0");
- this.cache = new CacheFactory().create();
+ server.withProperties(config).startServer();
TestResultSender resultSender = new TestResultSender();
FunctionContext context = new FunctionContextImpl("functionId", null, resultSender);