You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/17 20:23:54 UTC
[1/5] incubator-geode git commit: GEODE-1551: apply FlakyTest
category to testSimulateForEntireDS
Repository: incubator-geode
Updated Branches:
refs/heads/develop 374a1dc40 -> fc7660821
GEODE-1551: apply FlakyTest category to testSimulateForEntireDS
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fc766082
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fc766082
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fc766082
Branch: refs/heads/develop
Commit: fc766082165785836b4c2fa4bfdb108db9708237
Parents: 6ffef33
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Jun 17 11:47:54 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Jun 17 13:19:47 2016 -0700
----------------------------------------------------------------------
.../internal/cli/commands/GemfireDataCommandsDUnitTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fc766082/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 4914681..553b7a4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -1810,6 +1810,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
}
+ @Category(FlakyTest.class) // GEODE-1551: org.eclipse.jetty.io.EofException
@Test
public void testSimulateForEntireDS() {
setupTestRebalanceForEntireDS();
[5/5] incubator-geode git commit: GEODE-1559: add javadocs to
OptionJFormatter
Posted by kl...@apache.org.
GEODE-1559: add javadocs to OptionJFormatter
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/43a9918f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/43a9918f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/43a9918f
Branch: refs/heads/develop
Commit: 43a9918f571822d807feb68f14ca59dc87c89001
Parents: bcffff9
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Jun 17 11:34:25 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Jun 17 13:19:47 2016 -0700
----------------------------------------------------------------------
.../management/internal/cli/util/OptionJFormatter.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43a9918f/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/OptionJFormatter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/OptionJFormatter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/OptionJFormatter.java
index 4534f19..0e3265a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/OptionJFormatter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/OptionJFormatter.java
@@ -16,6 +16,9 @@
*/
package com.gemstone.gemfire.management.internal.cli.util;
+/**
+ * Inserts quotes around the values of any --J options.
+ */
public class OptionJFormatter {
private static final String J_OPTION = "--J=";
@@ -27,6 +30,9 @@ public class OptionJFormatter {
private String command;
private StringBuilder formatted;
+ /**
+ * Returns command with quotes inserted around the values of any --J options.
+ */
public String formatCommand(String command){
if (!containsJopt(command)) {
return command;
@@ -96,7 +102,10 @@ public class OptionJFormatter {
return formatted.toString();
}
- public boolean containsJopt(String cmd){
+ /**
+ * Returns true if command contains any --J options.
+ */
+ boolean containsJopt(String cmd){
if (cmd.contains("--J")){
return true;
}
[4/5] incubator-geode git commit: GEODE-1563: apply FlakyTest
category to testExecuteFunctionOnGroups
Posted by kl...@apache.org.
GEODE-1563: apply FlakyTest category to testExecuteFunctionOnGroups
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6ffef33e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6ffef33e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6ffef33e
Branch: refs/heads/develop
Commit: 6ffef33ed7c256e33c6871dbd52826b07a741e5c
Parents: 947628a
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Jun 17 11:46:04 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Jun 17 13:19:47 2016 -0700
----------------------------------------------------------------------
.../internal/cli/commands/FunctionCommandsDUnitTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ffef33e/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index 735de4f..478f9cd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -32,6 +32,8 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
import com.gemstone.gemfire.test.dunit.*;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -405,6 +407,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
}
}
+ @Category(FlakyTest.class) // GEODE-1563: JMX RMI (java.rmi.NoSuchObjectException: no such object in table)
@Test
public void testExecuteFunctionOnGroups() {
Properties localProps = new Properties();
[3/5] incubator-geode git commit: GEODE-1349: prevent
'java.lang.InternalError: MemoryPool not found'
Posted by kl...@apache.org.
GEODE-1349: prevent 'java.lang.InternalError: MemoryPool not found'
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bcffff9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bcffff9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bcffff9f
Branch: refs/heads/develop
Commit: bcffff9f0cc11c7e6d1055c6c72cf58383eca8b7
Parents: 374a1dc
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed May 25 13:45:00 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Jun 17 13:19:47 2016 -0700
----------------------------------------------------------------------
.../gemfire/internal/stats50/VMStats50.java | 46 +++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bcffff9f/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java
index 53d8f0e..6f2eea6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java
@@ -16,21 +16,44 @@
*/
package com.gemstone.gemfire.internal.stats50;
-import com.gemstone.gemfire.*;
+import java.lang.management.ClassLoadingMXBean;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.MemoryUsage;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.StatisticDescriptor;
+import com.gemstone.gemfire.Statistics;
+import com.gemstone.gemfire.StatisticsFactory;
+import com.gemstone.gemfire.StatisticsType;
+import com.gemstone.gemfire.StatisticsTypeFactory;
+import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
import com.gemstone.gemfire.internal.VMStatsContract;
-
-import java.lang.management.*;
-import java.lang.reflect.Method;
-import java.util.*;
+import com.gemstone.gemfire.internal.logging.LogService;
/**
* Statistics related to a Java VM.
* This version is hardcoded to use 1.5 MXBean stats from java.lang.management.
*/
public class VMStats50 implements VMStatsContract {
+ private final static Logger logger = LogService.getLogger(VMStats50.class.getName());
+
private final static StatisticsType vmType;
private final static ClassLoadingMXBean clBean;
@@ -480,6 +503,7 @@ public class VMStats50 implements VMStatsContract {
}
private void refreshMemoryPools() {
+ boolean reInitPools = false;
Iterator<Map.Entry<MemoryPoolMXBean,Statistics>> it = mpMap.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<MemoryPoolMXBean,Statistics> me = it.next();
@@ -488,6 +512,7 @@ public class VMStats50 implements VMStatsContract {
if (!mp.isValid()) {
s.close();
it.remove();
+ reInitPools = true;
} else {
MemoryUsage mu = null;
try {
@@ -495,6 +520,14 @@ public class VMStats50 implements VMStatsContract {
} catch (IllegalArgumentException ex) {
// to workaround JRockit bug 36348 just ignore this and try the next pool
continue;
+ } catch (InternalError ie) {
+ // Somebody saw an InternalError once but I have no idea how to reproduce it. Was this a race between
+ // mp.isValid() and mp.getUsage()? Perhaps.
+ s.close();
+ it.remove();
+ reInitPools = true;
+ logger.warn("Accessing MemoryPool '{}' threw an Internal Error: {}", mp.getName(), ie.getMessage());
+ continue;
}
s.setLong(mp_l_initMemoryId, mu.getInit());
s.setLong(mp_l_usedMemoryId, mu.getUsed());
@@ -531,6 +564,9 @@ public class VMStats50 implements VMStatsContract {
}
}
}
+ if (reInitPools) {
+ initMemoryPools();
+ }
}
private void initGC() {
[2/5] incubator-geode git commit: GEODE-835: remove developer name
from comments
Posted by kl...@apache.org.
GEODE-835: remove developer name from comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/947628a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/947628a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/947628a2
Branch: refs/heads/develop
Commit: 947628a202f8caa197fd2911257bef0dd754a201
Parents: 43a9918
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Jun 17 11:38:35 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Jun 17 13:19:47 2016 -0700
----------------------------------------------------------------------
.../internal/cli/parser/jopt/JoptOptionParser.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/947628a2/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
index bbda3e6..04590ed 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
@@ -115,7 +115,7 @@ public class JoptOptionParser implements GfshOptionParser {
optionSet.setUserInput(userInput!=null?userInput.trim():"");
if (userInput != null) {
TrimmedInput input = PreprocessorUtils.trim(userInput);
- String[] preProcessedInput = preProcess(new OptionJFormatter().formatCommand(input.getString())); // TODO: use OptionJFormatter
+ String[] preProcessedInput = preProcess(new OptionJFormatter().formatCommand(input.getString()));
joptsimple.OptionSet joptOptionSet = null;
CliCommandOptionException ce = null;
// int factor = 0;
@@ -123,21 +123,21 @@ public class JoptOptionParser implements GfshOptionParser {
joptOptionSet = parser.parse(preProcessedInput);
} catch (OptionException e) {
ce = processException(e);
- // TODO:KIRK: joptOptionSet = e.getDetected(); // TODO: removed when geode-joptsimple was removed
+ // TODO: joptOptionSet = e.getDetected(); // removed when geode-joptsimple was removed
}
if (joptOptionSet != null) {
// Make sure there are no miscellaneous, unknown strings that cannot be identified as
// either options or arguments.
if (joptOptionSet.nonOptionArguments().size() > arguments.size()) {
- String unknownString = (String)joptOptionSet.nonOptionArguments().get(arguments.size()); // TODO: added cast when geode-joptsimple was removed
+ String unknownString = (String)joptOptionSet.nonOptionArguments().get(arguments.size()); // added cast when geode-joptsimple was removed
// If the first option is un-parseable then it will be returned as "<option>=<value>" since it's
// been interpreted as an argument. However, all subsequent options will be returned as "<option>".
// This hack splits off the string before the "=" sign if it's the first case.
if (unknownString.matches("^-*\\w+=.*$")) {
unknownString = unknownString.substring(0, unknownString.indexOf('='));
}
- // TODO:KIRK: ce = processException(OptionException.createUnrecognizedOptionException(unknownString, joptOptionSet)); // TODO: removed when geode-joptsimple was removed
+ // TODO: ce = processException(OptionException.createUnrecognizedOptionException(unknownString, joptOptionSet)); // removed when geode-joptsimple was removed
}
// First process the arguments
@@ -199,7 +199,7 @@ public class JoptOptionParser implements GfshOptionParser {
if (arguments.size() > 1 && !(option.getConverter() instanceof MultipleValueConverter) && option.getValueSeparator() == null) {
List<String> optionList = new ArrayList<String>(1);
optionList.add(string);
- // TODO:KIRK: ce = processException(new MultipleArgumentsForOptionException(optionList, joptOptionSet)); // TODO: removed when geode-joptsimple was removed
+ // TODO: ce = processException(new MultipleArgumentsForOptionException(optionList, joptOptionSet)); // removed when geode-joptsimple was removed
} else if ((arguments.size() == 1 && !(option.getConverter() instanceof MultipleValueConverter)) || option.getValueSeparator() == null) {
optionSet.put(option, arguments.get(0).toString().trim());
} else {