You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/25 17:35:19 UTC
[1/7] incubator-geode git commit: GEODE-1150 removed unused code in
attemptToJoin function
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-17-2 9220f4292 -> 7e43465f9
GEODE-1150 removed unused code in attemptToJoin function
1.Removed unused code in attemptToJoin function
2.Now we don't send removal messageto member if we see join
request from it.
3. Fixed test issue for above changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/582b5371
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/582b5371
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/582b5371
Branch: refs/heads/feature/GEODE-17-2
Commit: 582b53716057781861c2ae49e754a51add4ef3d0
Parents: b6be5d4
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Wed Apr 20 16:00:06 2016 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Fri Apr 22 10:38:08 2016 -0700
----------------------------------------------------------------------
.../membership/gms/membership/GMSJoinLeave.java | 34 +++++++++-----------
.../gms/membership/GMSJoinLeaveJUnitTest.java | 7 +++-
2 files changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/582b5371/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 8b54838..05350e5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -389,18 +389,9 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
}
throw new AuthenticationFailedException(failReason);
}
-
- if (response.getCurrentView() == null) {
- logger.info("received join response with no membership view: {}", response);
- return isJoined;
- }
-
- this.birthViewId = response.getMemberID().getVmViewId();
- this.localAddress.setVmViewId(this.birthViewId);
- GMSMember me = (GMSMember) this.localAddress.getNetMember();
- me.setBirthViewId(birthViewId);
- installView(response.getCurrentView());
- return true;
+
+ //there is no way we can rech here right now
+ throw new RuntimeException("Join Request Failed with response " + joinResponse );
}
private JoinResponseMessage waitForJoinResponse() throws InterruptedException {
@@ -759,11 +750,16 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
return newView;
}
- private void sendRemoveMessages(List<InternalDistributedMember> removals, List<String> reasons, NetView newView) {
+ private void sendRemoveMessages(List<InternalDistributedMember> removals, List<String> reasons, NetView newView, Set<InternalDistributedMember> oldIds) {
Iterator<String> reason = reasons.iterator();
for (InternalDistributedMember mbr : removals) {
- RemoveMemberMessage response = new RemoveMemberMessage(mbr, mbr, reason.next());
- services.getMessenger().send(response);
+ //if olds not contains mbr then send remove request
+ if (!oldIds.contains(mbr)) {
+ RemoveMemberMessage response = new RemoveMemberMessage(mbr, mbr, reason.next());
+ services.getMessenger().send(response);
+ } else {
+ reason.next();
+ }
}
}
@@ -2091,7 +2087,9 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
removalReasons.add(((RemoveMemberMessage) msg).getReason());
} else {
sendRemoveMessages(Collections.<InternalDistributedMember>singletonList(mbr),
- Collections.<String>singletonList(((RemoveMemberMessage) msg).getReason()), currentView);
+ Collections.<String>singletonList(((RemoveMemberMessage) msg).getReason()),
+ currentView,
+ new HashSet<InternalDistributedMember>());
}
}
break;
@@ -2154,7 +2152,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
}
// send removal messages before installing the view so we stop
// getting messages from members that have been kicked out
- sendRemoveMessages(removalReqs, removalReasons, newView);
+ sendRemoveMessages(removalReqs, removalReasons, newView, oldIDs);
prepareAndSendView(newView, joinReqs, leaveReqs, newView.getCrashedMembers());
@@ -2265,7 +2263,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
for (int i = 0; i < size; i++) {
reasons.add("Failed to acknowledge a new membership view and then failed tcp/ip connection attempt");
}
- sendRemoveMessages(failures, reasons, newView);
+ sendRemoveMessages(failures, reasons, newView, new HashSet<InternalDistributedMember>());
}
// if there is no conflicting view then we can count
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/582b5371/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 6c23037..50bed13 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -1075,19 +1075,24 @@ public class GMSJoinLeaveJUnitTest {
FindCoordinatorResponse fcr = new FindCoordinatorResponse(mockMembers[0], mockMembers[0], false, null, registrants, false, true);
NetView view = createView();
JoinResponseMessage jrm = new JoinResponseMessage(mockMembers[0], view);
- gmsJoinLeave.setJoinResponseMessage(jrm);
TcpClientWrapper tcpClientWrapper = mock(TcpClientWrapper.class);
gmsJoinLeave.setTcpClientWrapper(tcpClientWrapper);
FindCoordinatorRequest fcreq = new FindCoordinatorRequest(gmsJoinLeaveMemberId, new HashSet<>(), -1);
int connectTimeout = (int)services.getConfig().getMemberTimeout() * 2;
when(tcpClientWrapper.sendCoordinatorFindRequest(new InetSocketAddress("localhost", 12345), fcreq, connectTimeout)).thenReturn(fcr);
+ callAsnyc(()->{gmsJoinLeave.installView(view);});
assertTrue("Should be able to join ", gmsJoinLeave.join());
}finally{
}
}
+ private void callAsnyc(Runnable run) {
+ Thread th = new Thread(run);
+ th.start();
+ }
+
@Test
public void testCoordinatorFindRequestFailure() throws Exception {
try{
[2/7] incubator-geode git commit: GEODE-1150 Find Coodinator response
was not notifying waiting thread
Posted by ji...@apache.org.
GEODE-1150 Find Coodinator response was not notifying waiting thread
1. Now find Coordinator response notifies waiting thread.
2. joinrequest sees join response if member is no more coordinator
3. Test issue - now we wait for coordinator to change before verifying it
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b6be5d47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b6be5d47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b6be5d47
Branch: refs/heads/feature/GEODE-17-2
Commit: b6be5d473df2c79a8527f688c6ee875337b96409
Parents: 70c5467
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Mon Apr 18 09:41:41 2016 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Fri Apr 22 10:38:08 2016 -0700
----------------------------------------------------------------------
.../membership/gms/membership/GMSJoinLeave.java | 62 +++++++++++++++++++-
.../gemfire/distributed/LocatorDUnitTest.java | 32 ++++++----
.../gms/membership/GMSJoinLeaveTestHelper.java | 5 ++
3 files changed, 85 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6be5d47/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index d91b247..8b54838 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -414,6 +414,29 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
joinResponse.wait(timeout);
}
response = joinResponse[0];
+
+ if (response != null && response.getCurrentView() != null && !isJoined) {
+ //reset joinResponse[0]
+ joinResponse[0] = null;
+ // we got view here that means either we have to wait for
+ NetView v = response.getCurrentView();
+ InternalDistributedMember coord = v.getCoordinator();
+ if (searchState.alreadyTried.contains(coord)) {
+ // we already sent join request to it..so lets wait some more time here
+ // assuming we got this response immediately, so wait for same timeout here..
+ long timeout = Math.max(services.getConfig().getMemberTimeout(), services.getConfig().getJoinTimeout() / 5);
+ joinResponse.wait(timeout);
+ response = joinResponse[0];
+ } else {
+ // try on this coordinator
+ searchState.possibleCoordinator = coord;
+ response = null;
+ }
+ searchState.view = v;
+ }
+ if (isJoined) {
+ return null;
+ }
}
return response;
}
@@ -620,6 +643,9 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
viewRequests.add(request);
viewRequests.notifyAll();
}
+ if (viewCreator != null) {
+ viewCreator.informToPendingJoinRequests();
+ }
}
// for testing purposes, returns a copy of the view requests for verification
@@ -1174,6 +1200,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
private void processFindCoordinatorResponse(FindCoordinatorResponse resp) {
synchronized (searchState.responses) {
searchState.responses.add(resp);
+ searchState.responses.notifyAll();
}
}
@@ -1771,7 +1798,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
}
class ViewCreator extends Thread {
- boolean shutdown = false;
+ volatile boolean shutdown = false;
volatile boolean waiting = false;
volatile boolean testFlagForRemovalRequest = false;
@@ -1960,6 +1987,39 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
}
} finally {
shutdown = true;
+ informToPendingJoinRequests();
+ }
+ }
+
+ synchronized void informToPendingJoinRequests() {
+ if (!shutdown) {
+ return;
+ }
+
+ ArrayList<DistributionMessage> requests = new ArrayList<>();
+ synchronized (viewRequests) {
+ if (viewRequests.size() > 0) {
+ requests.addAll(viewRequests);
+ } else {
+ return;
+ }
+ viewRequests.clear();
+ }
+
+ for (DistributionMessage msg : requests) {
+ switch (msg.getDSFID()) {
+ case JOIN_REQUEST:
+ logger.info("Informing to pending join requests {}", msg);
+
+ NetView v = currentView;
+ if (!v.getCoordinator().equals(localAddress)) {
+ //lets inform that coordinator has been changed
+ JoinResponseMessage jrm = new JoinResponseMessage(((JoinRequestMessage) msg).getMemberID(), v);
+ services.getMessenger().send(jrm);
+ }
+ default:
+ break;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6be5d47/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 71eb68e..702a859 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -1412,7 +1412,6 @@ public class LocatorDUnitTest extends DistributedTestCase {
}
};
}
-
/**
* Tests starting multiple locators at the same time and ensuring that the locators
* end up only have 1 master.
@@ -1516,9 +1515,11 @@ public class LocatorDUnitTest extends DistributedTestCase {
host0 + "[" + port3 + "]";
dsProps.setProperty("locators", newLocators);
- assertTrue(vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
+ assertTrue(vm3.invoke("Checking ViewCreator thread on Lead Server", () -> GMSJoinLeaveTestHelper.isViewCreator()));
//Given the start up order of servers, this server is the elder server
- assertTrue(vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
+ assertTrue(vm3.invoke("Checking ViewCreator thread on Lead Server", () -> GMSJoinLeaveTestHelper.isViewCreator()));
+
+ final InternalDistributedMember currentCoordinator = GMSJoinLeaveTestHelper.getCurrentCoordinator();
startLocatorAsync(vm1, new Object[] { port2, dsProps });
startLocatorAsync(vm2, new Object[] { port3, dsProps });
@@ -1526,6 +1527,11 @@ public class LocatorDUnitTest extends DistributedTestCase {
waitCriterion = new WaitCriterion() {
public boolean done() {
try {
+ InternalDistributedMember c = GMSJoinLeaveTestHelper.getCurrentCoordinator();
+ if (c.equals(currentCoordinator)) {
+ //now locator should be new coordinator
+ return false;
+ }
return system.getDM().getAllHostedLocators().size() == 2;
} catch (Exception e) {
e.printStackTrace();
@@ -1540,17 +1546,17 @@ public class LocatorDUnitTest extends DistributedTestCase {
};
Wait.waitForCriterion(waitCriterion, 15 * 1000, 200, true);
- int netviewId = vm1.invoke(() -> GMSJoinLeaveTestHelper.getViewId());
- assertEquals(netviewId, (int) vm2.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertEquals(netviewId, (int) vm3.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertEquals(netviewId, (int) vm4.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertFalse(vm4.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
+ int netviewId = vm1.invoke("Checking ViewCreator", () -> GMSJoinLeaveTestHelper.getViewId());
+ assertEquals(netviewId, (int) vm2.invoke("checking ViewID", () -> GMSJoinLeaveTestHelper.getViewId()));
+ assertEquals(netviewId, (int) vm3.invoke("checking ViewID", () -> GMSJoinLeaveTestHelper.getViewId()));
+ assertEquals(netviewId, (int) vm4.invoke("checking ViewID", () -> GMSJoinLeaveTestHelper.getViewId()));
+ assertFalse(vm4.invoke("Checking ViewCreator", () -> GMSJoinLeaveTestHelper.isViewCreator()));
//Given the start up order of servers, this server is the elder server
- assertFalse(vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
+ assertFalse(vm3.invoke("Checking ViewCreator", () -> GMSJoinLeaveTestHelper.isViewCreator()));
if (vm1.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator())) {
- assertFalse(vm2.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
+ assertFalse(vm2.invoke("Checking ViewCreator", () -> GMSJoinLeaveTestHelper.isViewCreator()));
} else {
- assertTrue(vm2.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
+ assertTrue(vm2.invoke("Checking ViewCreator", () -> GMSJoinLeaveTestHelper.isViewCreator()));
}
} finally {
@@ -1565,7 +1571,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
}
private void startLocatorSync(VM vm, Object[] args) {
- vm.invoke(new SerializableRunnable("Starting process on " + args[0], args) {
+ vm.invoke(new SerializableRunnable("Starting locator process on " + args[0], args) {
public void run() {
File logFile = new File("");
try {
@@ -1578,7 +1584,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
}
private void startLocatorAsync(VM vm, Object[] args) {
- vm.invokeAsync(new SerializableRunnable("Starting process on " + args[0], args) {
+ vm.invokeAsync(new SerializableRunnable("Starting Locator process async on " + args[0], args) {
public void run() {
File logFile = new File("");
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6be5d47/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
index 17409a4..bf13420 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
@@ -19,6 +19,7 @@ package com.gemstone.gemfire.distributed.internal.membership.gms.membership;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DM;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.distributed.internal.membership.gms.Services;
import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -70,6 +71,10 @@ public class GMSJoinLeaveTestHelper {
Services services = membershipManager.getServices();
return (GMSJoinLeave) services.getJoinLeave();
}
+
+ public static InternalDistributedMember getCurrentCoordinator() {
+ return getGmsJoinLeave().getView().getCoordinator();
+ }
public static Integer getViewId() {
return getGmsJoinLeave().getView().getViewId();
[5/7] incubator-geode git commit: Fixing artifact names for M2
Posted by ji...@apache.org.
Fixing artifact names for M2
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0d184b6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0d184b6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0d184b6d
Branch: refs/heads/feature/GEODE-17-2
Commit: 0d184b6d23b96a6d792a279911898506f45146e2
Parents: 4cab194
Author: William Markito <wm...@pivotal.io>
Authored: Fri Apr 22 12:13:46 2016 -0700
Committer: William Markito <wm...@pivotal.io>
Committed: Fri Apr 22 12:13:46 2016 -0700
----------------------------------------------------------------------
geode-site/website/content/releases/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d184b6d/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index 5d2f15c..33640bb 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -67,7 +67,7 @@ under the License. -->
<li> <strong>Gradle</strong>
<pre class="prettyprint">
dependencies {
- compile 'org.apache.geode:gemfire-core:1.0.0-incubating.M2'
+ compile 'org.apache.geode:geode-core:1.0.0-incubating.M2'
}</pre>
<!-- ><script src="https://gist.github.com/markito/b7796cafef4bd273bd07.js"></script>-->
</li>
@@ -76,7 +76,7 @@ under the License. -->
<dependencies>
<dependency>
<groupId>org.apache.geode</groupId>
- <artifactId>gemfire-core</artifactId>
+ <artifactId>geode-core</artifactId>
<version>1.0.0-incubating.M2</version>
</dependency>
</dependencies></pre>
[7/7] incubator-geode git commit: Merge branch 'develop' into
feature/GEODE-17-2
Posted by ji...@apache.org.
Merge branch 'develop' into feature/GEODE-17-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7e43465f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7e43465f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7e43465f
Branch: refs/heads/feature/GEODE-17-2
Commit: 7e43465f93635f6186422811e033aa16e2aeff2b
Parents: 9220f42 3c5a2e8
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Apr 25 08:34:38 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Apr 25 08:34:38 2016 -0700
----------------------------------------------------------------------
geode-assembly/build.gradle | 4 +-
.../membership/gms/membership/GMSJoinLeave.java | 96 ++++++++++++++++----
.../gemfire/cache/ConnectionPoolDUnitTest.java | 21 -----
.../gemfire/distributed/LocatorDUnitTest.java | 32 ++++---
.../gms/membership/GMSJoinLeaveJUnitTest.java | 7 +-
.../gms/membership/GMSJoinLeaveTestHelper.java | 5 +
geode-site/website/content/releases/index.html | 52 +++++++++++
gradle/publish.gradle | 4 +-
8 files changed, 163 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e43465f/geode-assembly/build.gradle
----------------------------------------------------------------------
[3/7] incubator-geode git commit: GEODE-1197 CI failure:
ConnectionPoolAutoDUnitTest.test009LifetimeExpireOnTL
Posted by ji...@apache.org.
GEODE-1197 CI failure: ConnectionPoolAutoDUnitTest.test009LifetimeExpireOnTL
Removing the unnecessary code that causes the failure.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1c52e28e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1c52e28e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1c52e28e
Branch: refs/heads/feature/GEODE-17-2
Commit: 1c52e28e705e9ed0e69eced7d3a1872b5458421d
Parents: 582b537
Author: Jianxia Chen <jc...@pivotal.io>
Authored: Fri Apr 22 11:37:34 2016 -0700
Committer: Jianxia Chen <jc...@pivotal.io>
Committed: Fri Apr 22 11:37:34 2016 -0700
----------------------------------------------------------------------
.../gemfire/cache/ConnectionPoolDUnitTest.java | 21 --------------------
1 file changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1c52e28e/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
index bbc2839..a5ddb4e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
@@ -1415,27 +1415,6 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
vm2.invoke(verify1Server);
assertEquals(true, putAI.isAlive());
assertEquals(true, putAI2.isAlive());
-
- {
- final int restartPort = port1;
- vm1.invoke(new SerializableRunnable("Restart CacheServer") {
- public void run() {
- try {
- Region region = getRootRegion().getSubregion(name);
- assertNotNull(region);
- startBridgeServer(restartPort);
- }
- catch(Exception e) {
- getSystem().getLogWriter().fine(new Exception(e));
- com.gemstone.gemfire.test.dunit.Assert.fail("Failed to start CacheServer", e);
- }
- }
- });
- }
-
- vm2.invoke(verify2Servers);
- assertEquals(true, putAI.isAlive());
- assertEquals(true, putAI2.isAlive());
} finally {
vm2.invoke(new SerializableRunnable("Stop Putters") {
public void run() {
[6/7] incubator-geode git commit: GEODE-1271: Correcting file format
and extension for sha256, md5 files
Posted by ji...@apache.org.
GEODE-1271: Correcting file format and extension for sha256, md5 files
The .sha-256 files are now sha256. The format of the file is now
CHECKUM *filename
Which matches what is expected by sha256sum -c and md5sum -c
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3c5a2e85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3c5a2e85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3c5a2e85
Branch: refs/heads/feature/GEODE-17-2
Commit: 3c5a2e85a0c23b3733c1721ee0ea7286a7b4fd3f
Parents: 0d184b6
Author: Dan Smith <up...@apache.org>
Authored: Fri Apr 22 15:22:07 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Apr 22 15:33:56 2016 -0700
----------------------------------------------------------------------
geode-assembly/build.gradle | 4 ++--
gradle/publish.gradle | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c5a2e85/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index b7d05e2..e849b51 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -231,8 +231,8 @@ gradle.taskGraph.whenReady( { graph ->
it.name.toLowerCase().contains("dist")
}.each { archive ->
archive.doLast {
- ant.checksum file:"${archive.archivePath}", algorithm:"md5"
- ant.checksum file:"${archive.archivePath}", algorithm:"sha-256"
+ ant.checksum file:"${archive.archivePath}", algorithm:"md5", format: 'MD5SUM'
+ ant.checksum file:"${archive.archivePath}", algorithm:"sha-256", format: 'MD5SUM', fileext: '.sha256'
}
}
})
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c5a2e85/gradle/publish.gradle
----------------------------------------------------------------------
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 9c251c7..768fce4 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -127,7 +127,7 @@ gradle.taskGraph.whenReady { taskGraph ->
if(taskGraph.allTasks.any {it instanceof Sign}) {
if(!project.hasProperty('signing.keyId') || !project.hasProperty('signing.secretKeyRingFile')) {
println "You must configure your signing.keyId and signing.secretKeyRingFile"
- println "in ~/gradle/.properties in order to sign jars\n"
+ println "in ~/.gradle/gradle.properties in order to sign jars\n"
println "See https://cwiki.apache.org/confluence/display/GEODE/Release+Steps"
throw new GradleException("Signing key/keyring is missing")
}
@@ -141,7 +141,7 @@ gradle.taskGraph.whenReady { taskGraph ->
if(taskGraph.allTasks.any {it.name == 'uploadArchives'}) {
if(!project.hasProperty('nexusUsername')) {
- println "You must configure your nexusUsername in ~/gradle/.properties in order to uploadArchives\n"
+ println "You must configure your nexusUsername in ~/.gradle/gradle.properties in order to uploadArchives\n"
println "See https://cwiki.apache.org/confluence/display/GEODE/Release+Steps"
throw new GradleException("nexusUsername is missing")
}
[4/7] incubator-geode git commit: Updating geode website release page
for M2
Posted by ji...@apache.org.
Updating geode website release page for M2
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4cab194a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4cab194a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4cab194a
Branch: refs/heads/feature/GEODE-17-2
Commit: 4cab194a7a65e7c6e77338ad3097447ca2d5bae2
Parents: 1c52e28
Author: William Markito <wm...@pivotal.io>
Authored: Fri Apr 22 11:39:12 2016 -0700
Committer: William Markito <wm...@pivotal.io>
Committed: Fri Apr 22 11:42:52 2016 -0700
----------------------------------------------------------------------
geode-site/website/content/releases/index.html | 52 +++++++++++++++++++++
1 file changed, 52 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4cab194a/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index 10ba781..5d2f15c 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -34,6 +34,57 @@ under the License. -->
</p>
<!-- RELEASES -->
<div class="container">
+ <!-- START OF M2 -->
+ <h3><span class="icon-flag-checkered"> 1.0.0-incubating.M2</span></h3>
+ <!-- BINARY -->
+ <ul>
+ <span class="icon-cloud-download"> <strong>Binaries </strong>
+ [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip">ZIP</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.sha-256">SHA-256</a> ,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.asc">PGP</a> ] -
+ [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz">TAR.GZ</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.sha-256">SHA-256</a> ,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.asc">PGP</a> ]
+ </span>
+
+ <blockquote>Binary downloads are provided for the convenience of our users and are not official Apache Geode releases. </blockquote>
+ </li>
+ </ul>
+ <!-- SOURCE -->
+ <ul>
+ <span class="icon-cloud-download"> <strong>Source</strong>
+ [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.zip">ZIP</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.zip.sha-256">SHA-256</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.zip.asc">PGP</a>
+ ] -
+ [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.tar.gz">TAR.GZ</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.tar.gz.sha-256">SHA-256</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.tar.gz.asc">PGP</a>
+ ]
+ </span>
+ </li>
+ </ul>
+ <!-- DEPENDENCY MANAGERS -->
+ <div class="container">
+ <h4><span class="icon-archive"> Dependency Managers</span></h4>
+ <ul>
+ <li> <strong>Gradle</strong>
+ <pre class="prettyprint">
+ dependencies {
+ compile 'org.apache.geode:gemfire-core:1.0.0-incubating.M2'
+ }</pre>
+ <!-- ><script src="https://gist.github.com/markito/b7796cafef4bd273bd07.js"></script>-->
+ </li>
+ <li> <strong>Maven</strong>
+ <pre class="prettyprint">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geode</groupId>
+ <artifactId>gemfire-core</artifactId>
+ <version>1.0.0-incubating.M2</version>
+ </dependency>
+ </dependencies></pre>
+ </li>
+ </ul>
+ </div>
+ <!-- END OF M2 -->
+ <!-- START OF M1 -->
<h3><span class="icon-flag-checkered"> 1.0.0-incubating.M1</span></h3>
<!-- BINARY -->
<ul>
@@ -82,6 +133,7 @@ under the License. -->
</li>
</ul>
</div>
+ <!-- END OF M1 -->
</div>
<!-- END OF RELEASE -->
<hr/>