You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/06/08 14:01:51 UTC
[1/3] storm git commit: STORM-3098: Fixed method
filterChangingBlobsFor()
Repository: storm
Updated Branches:
refs/heads/master ab9768799 -> 93fc34100
STORM-3098: Fixed method filterChangingBlobsFor()
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/498da9e7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/498da9e7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/498da9e7
Branch: refs/heads/master
Commit: 498da9e77cec4d5cb9dfbb1044cb9634f1ff0422
Parents: 3e098f1
Author: Zhengdai Hu <hu...@gmail.com>
Authored: Thu Jun 7 09:19:44 2018 -0500
Committer: Zhengdai Hu <hu...@gmail.com>
Committed: Thu Jun 7 09:19:44 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/supervisor/Slot.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/498da9e7/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
index 1dda41c..b0116e2 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
@@ -381,7 +381,7 @@ public class Slot extends Thread implements AutoCloseable, BlobChangingCallback
* @return the updated dynamicState
*/
private static DynamicState filterChangingBlobsFor(DynamicState dynamicState, final LocalAssignment assignment) {
- if (!dynamicState.changingBlobs.isEmpty()) {
+ if (dynamicState.changingBlobs.isEmpty()) {
return dynamicState;
}
[2/3] storm git commit: STORM-3098: Modified testResourcesChanged()
to include testing filterChangedBlob()
Posted by bo...@apache.org.
STORM-3098: Modified testResourcesChanged() to include testing filterChangedBlob()
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5e5ff780
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5e5ff780
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5e5ff780
Branch: refs/heads/master
Commit: 5e5ff7807662ceb34f028d4fb5c54fffe3d24793
Parents: 498da9e
Author: Zhengdai Hu <hu...@gmail.com>
Authored: Thu Jun 7 14:37:08 2018 -0500
Committer: Zhengdai Hu <hu...@gmail.com>
Committed: Thu Jun 7 14:37:08 2018 -0500
----------------------------------------------------------------------
.../storm/daemon/supervisor/SlotTest.java | 26 +++++++++++---------
1 file changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5e5ff780/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java b/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java
index 2889cd1..282c139 100644
--- a/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java
+++ b/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java
@@ -50,14 +50,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
public class SlotTest {
private static final Logger LOG = LoggerFactory.getLogger(SlotTest.class);
@@ -514,7 +507,7 @@ public class SlotTest {
}
@Test
- public void testResourcesChanged() throws Exception {
+ public void testResourcesChangedFiltered() throws Exception {
try (SimulatedTime t = new SimulatedTime(1010)) {
int port = 8080;
String cTopoId = "CURRENT";
@@ -522,6 +515,9 @@ public class SlotTest {
LocalAssignment cAssignment =
mkLocalAssignment(cTopoId, cExecList, mkWorkerResources(100.0, 100.0, 100.0));
+ String otherTopoId = "OTHER";
+ LocalAssignment otherAssignment = mkLocalAssignment(otherTopoId, cExecList, mkWorkerResources(100.0, 100.0, 100.0));
+
BlobChangingCallback cb = mock(BlobChangingCallback.class);
Container cContainer = mock(Container.class);
@@ -541,11 +537,17 @@ public class SlotTest {
containerLauncher, "localhost", port, iSuper, state, cb, null, null);
Set<Slot.BlobChanging> changing = new HashSet<>();
+
LocallyCachedBlob stormJar = mock(LocallyCachedBlob.class);
GoodToGo.GoodToGoLatch stormJarLatch = mock(GoodToGo.GoodToGoLatch.class);
CompletableFuture<Void> stormJarLatchFuture = mock(CompletableFuture.class);
when(stormJarLatch.countDown()).thenReturn(stormJarLatchFuture);
changing.add(new Slot.BlobChanging(cAssignment, stormJar, stormJarLatch));
+ Set<Slot.BlobChanging> desired = new HashSet<>(changing);
+
+ LocallyCachedBlob otherJar = mock(LocallyCachedBlob.class);
+ GoodToGo.GoodToGoLatch otherJarLatch = mock(GoodToGo.GoodToGoLatch.class);
+ changing.add(new Slot.BlobChanging(otherAssignment, otherJar, otherJarLatch));
DynamicState dynamicState = new DynamicState(cAssignment, cContainer, cAssignment).withChangingBlobs(changing);
@@ -554,9 +556,11 @@ public class SlotTest {
verify(iSuper).killedWorker(port);
verify(cContainer).kill();
verify(localizer, never()).requestDownloadTopologyBlobs(any(), anyInt(), any());
+ verify(stormJarLatch, never()).countDown();
+ verify(otherJarLatch, times(1)).countDown();
assertNull(nextState.pendingDownload);
assertNull(nextState.pendingLocalization);
- assertEquals(changing, nextState.changingBlobs);
+ assertEquals(desired, nextState.changingBlobs);
assertTrue(nextState.pendingChangingBlobs.isEmpty());
assertNull(nextState.pendingChangingBlobsAssignment);
assertThat(Time.currentTimeMillis(), greaterThan(1000L));
@@ -566,7 +570,7 @@ public class SlotTest {
verify(cContainer).forceKill();
assertNull(nextState.pendingDownload);
assertNull(nextState.pendingLocalization);
- assertEquals(changing, nextState.changingBlobs);
+ assertEquals(desired, nextState.changingBlobs);
assertTrue(nextState.pendingChangingBlobs.isEmpty());
assertNull(nextState.pendingChangingBlobsAssignment);
assertThat(Time.currentTimeMillis(), greaterThan(2000L));
[3/3] storm git commit: Merge branch 'STORM-3098' of
https://github.com/zd-project/storm into STORM-3098
Posted by bo...@apache.org.
Merge branch 'STORM-3098' of https://github.com/zd-project/storm into STORM-3098
STORM-3098: Fixed method filterChangingBlobsFor()
This closes #2708
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/93fc3410
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/93fc3410
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/93fc3410
Branch: refs/heads/master
Commit: 93fc34100ba8110e39fc9908d33c5ff8df8e5545
Parents: ab97687 5e5ff78
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 8 08:39:16 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 8 08:39:16 2018 -0500
----------------------------------------------------------------------
.../apache/storm/daemon/supervisor/Slot.java | 2 +-
.../storm/daemon/supervisor/SlotTest.java | 26 +++++++++++---------
2 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/93fc3410/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
----------------------------------------------------------------------