This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 8f8830860 [STORM-3764] Cleanup from merge: Fix NPE in
SchedulingSearcherState.backtrack()
8f8830860 is described below
commit 8f883086032669a8f04b09a3b312d60af5b44533
Author: Richard Zowalla <[email protected]>
AuthorDate: Wed Oct 25 11:29:13 2023 +0200
[STORM-3764] Cleanup from merge: Fix NPE in
SchedulingSearcherState.backtrack()
---
.../TestGenericResourceAwareStrategy.java | 59 +---------------------
1 file changed, 1 insertion(+), 58 deletions(-)
diff --git
a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestGenericResourceAwareStrategy.java
b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestGenericResourceAwareStrategy.java
index df7fda3ef..abdd9ae86 100644
---
a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestGenericResourceAwareStrategy.java
+++
b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestGenericResourceAwareStrategy.java
@@ -659,7 +659,7 @@ public class TestGenericResourceAwareStrategy {
scheduler.prepare(conf, new StormMetricsRegistry());
scheduler.schedule(topologies, cluster);
- // First it tries too schedule spout [0, 0] with a bound acker [1,
1] to sup1 r000s000.
+ // First it tries to schedule spout [0, 0] with a bound acker [1,
1] to sup1 r000s000.
// However, sup2 r000s001 only has 400 on-heap mem which can not
fit the left over acker [2, 2]
// So it backtrack to [0, 0] and put it to sup2 r000s001.
// Then put two ackers both as left-over ackers to sup1 r000s000.
@@ -678,61 +678,4 @@ public class TestGenericResourceAwareStrategy {
assertEquals(expectedScheduling, foundScheduling);
}
}
-
- @Test
- public void testScheduleLeftOverAckers() throws Exception {
- int spoutParallelism = 1;
- TopologyBuilder builder = new TopologyBuilder();
- builder.setSpout("spout", new TestSpout(), spoutParallelism);
-
- String topoName = "testTopology";
- StormTopology stormToplogy = builder.createTopology();
-
- INimbus iNimbus = new INimbusTest();
- Config conf = createGrasClusterConfig(50, 400, 0, null,
Collections.emptyMap());
-
- Map<String, SupervisorDetails> supMap = genSupervisors(1, 1, 100,
1100);
- Map<String, SupervisorDetails> tmpSupMap = genSupervisors(2, 1, 100,
400);
- supMap.put("r000s001", tmpSupMap.get("r000s001"));
- LOG.info("{}", tmpSupMap.get("r000s001"));
-
- conf.put(Config.TOPOLOGY_PRIORITY, 0);
- conf.put(Config.TOPOLOGY_NAME, topoName);
- conf.put(Config.TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB, 1000);
- conf.put(Config.TOPOLOGY_SUBMITTER_USER, "user");
- conf.put(Config.TOPOLOGY_ACKER_EXECUTORS, 2);
- conf.put(Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER, 1);
-
- conf.put(Config.TOPOLOGY_ACKER_RESOURCES_ONHEAP_MEMORY_MB, 500);
- conf.put(Config.TOPOLOGY_ACKER_CPU_PCORE_PERCENT, 0);
-
- TopologyDetails topo = new TopologyDetails("testTopology-id", conf,
stormToplogy, 0,
- genExecsAndComps(StormCommon.systemTopology(conf, stormToplogy)),
currentTime, "user");
-
- Topologies topologies = new Topologies(topo);
- Cluster cluster = new Cluster(iNimbus, new ResourceMetrics(new
StormMetricsRegistry()), supMap, new HashMap<>(), topologies, conf);
-
- scheduler = new ResourceAwareScheduler();
-
- scheduler.prepare(conf, new StormMetricsRegistry());
- scheduler.schedule(topologies, cluster);
-
- // First it tries too schedule spout [0, 0] with a bound acker [1, 1]
to sup1 r000s000.
- // However, sup2 r000s001 only has 400 on-heap mem which can not fit
the left over acker [2, 2]
- // So it backtrack to [0, 0] and put it to sup2 r000s001.
- // Then put two ackers both as left-over ackers to sup1 r000s000.
- HashSet<HashSet<ExecutorDetails>> expectedScheduling = new HashSet<>();
- expectedScheduling.add(new HashSet<>(Arrays.asList(
- new ExecutorDetails(0, 0)))); // spout
- expectedScheduling.add(new HashSet<>(Arrays.asList(
- new ExecutorDetails(1, 1), // acker
- new ExecutorDetails(2, 2)))); // acker
-
- HashSet<HashSet<ExecutorDetails>> foundScheduling = new HashSet<>();
- SchedulerAssignment assignment =
cluster.getAssignmentById("testTopology-id");
- for (Collection<ExecutorDetails> execs :
assignment.getSlotToExecutors().values()) {
- foundScheduling.add(new HashSet<>(execs));
- }
- assertEquals(expectedScheduling, foundScheduling);
- }
}
