dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speed up edge controller test by introducing executor and futures approach

Browse Source
This commit is contained in:
Volodymyr Babak 2023-01-24 15:55:59 +02:00
parent 08114319eb
commit 9ee2a40735
1 changed files with 92 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java
View File

@ -17,6 +17,10 @@ package org.thingsboard.server.controller;
import com.datastax.oss.driver.api.core.uuid.Uuids; import com.datastax.oss.driver.api.core.uuid.Uuids;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import org.junit.After; import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
@ -28,6 +32,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestPropertySource;
import org.thingsboard.common.util.ThingsBoardExecutors;
import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.EntitySubtype; import org.thingsboard.server.common.data.EntitySubtype;
@ -58,13 +63,10 @@ import org.thingsboard.server.gen.edge.v1.RuleChainUpdateMsg;
import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg; import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg;
import org.thingsboard.server.gen.edge.v1.UserUpdateMsg; import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
import java.io.File;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
@ -86,6 +88,10 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
private TenantId tenantId; private TenantId tenantId;
private User tenantAdmin; private User tenantAdmin;
ListeningExecutorService executor;
List<ListenableFuture<Edge>> futures;
@Autowired @Autowired
private EdgeDao edgeDao; private EdgeDao edgeDao;
@ -99,6 +105,8 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
@Before @Before
public void beforeTest() throws Exception { public void beforeTest() throws Exception {
executor = MoreExecutors.listeningDecorator(ThingsBoardExecutors.newWorkStealingPool(8, getClass()));
loginSysAdmin(); loginSysAdmin();
Tenant tenant = new Tenant(); Tenant tenant = new Tenant();
@ -119,6 +127,8 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
@After @After
public void afterTest() throws Exception { public void afterTest() throws Exception {
executor.shutdownNow();
loginSysAdmin(); loginSysAdmin();
doDelete("/api/tenant/" + savedTenant.getId().getId().toString()) doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
@ -385,11 +395,14 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
@Test @Test
public void testFindTenantEdges() throws Exception { public void testFindTenantEdges() throws Exception {
List<Edge> edges = new ArrayList<>(); int cntEntity = 178;
for (int i = 0; i < 178; i++) { futures = new ArrayList<>(cntEntity);
for (int i = 0; i < cntEntity; i++) {
Edge edge = constructEdge("Edge" + i, "default"); Edge edge = constructEdge("Edge" + i, "default");
edges.add(doPost("/api/edge", edge, Edge.class)); futures.add(executor.submit(() ->
doPost("/api/edge", edge, Edge.class)));
} }
List<Edge> edges = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
List<Edge> loadedEdges = new ArrayList<>(); List<Edge> loadedEdges = new ArrayList<>();
PageLink pageLink = new PageLink(23); PageLink pageLink = new PageLink(23);
PageData<Edge> pageData = null; PageData<Edge> pageData = null;
@ -412,23 +425,30 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
@Test @Test
public void testFindTenantEdgesByName() throws Exception { public void testFindTenantEdgesByName() throws Exception {
String title1 = "Edge title 1"; String title1 = "Edge title 1";
List<Edge> edgesTitle1 = new ArrayList<>(); int cntEntity = 143;
for (int i = 0; i < 143; i++) { futures = new ArrayList<>(cntEntity);
for (int i = 0; i < cntEntity; i++) {
String suffix = StringUtils.randomAlphanumeric(15); String suffix = StringUtils.randomAlphanumeric(15);
String name = title1 + suffix; String name = title1 + suffix;
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase(); name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
Edge edge = constructEdge(name, "default"); Edge edge = constructEdge(name, "default");
edgesTitle1.add(doPost("/api/edge", edge, Edge.class)); futures.add(executor.submit(() ->
doPost("/api/edge", edge, Edge.class)));
} }
List<Edge> edgesTitle1 = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
String title2 = "Edge title 2"; String title2 = "Edge title 2";
List<Edge> edgesTitle2 = new ArrayList<>(); cntEntity = 75;
for (int i = 0; i < 75; i++) { futures = new ArrayList<>(cntEntity);
for (int i = 0; i < cntEntity; i++) {
String suffix = StringUtils.randomAlphanumeric(15); String suffix = StringUtils.randomAlphanumeric(15);
String name = title2 + suffix; String name = title2 + suffix;
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase(); name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
Edge edge = constructEdge(name, "default"); Edge edge = constructEdge(name, "default");
edgesTitle2.add(doPost("/api/edge", edge, Edge.class)); futures.add(executor.submit(() ->
doPost("/api/edge", edge, Edge.class)));
} }
List<Edge> edgesTitle2 = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
List<Edge> loadedEdgesTitle1 = new ArrayList<>(); List<Edge> loadedEdgesTitle1 = new ArrayList<>();
PageLink pageLink = new PageLink(15, 0, title1); PageLink pageLink = new PageLink(15, 0, title1);
@ -494,24 +514,31 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
public void testFindTenantEdgesByType() throws Exception { public void testFindTenantEdgesByType() throws Exception {
String title1 = "Edge title 1"; String title1 = "Edge title 1";
String type1 = "typeA"; String type1 = "typeA";
List<Edge> edgesType1 = new ArrayList<>(); int cntEntity = 143;
for (int i = 0; i < 143; i++) { futures = new ArrayList<>(cntEntity);
for (int i = 0; i < cntEntity; i++) {
String suffix = StringUtils.randomAlphanumeric(15); String suffix = StringUtils.randomAlphanumeric(15);
String name = title1 + suffix; String name = title1 + suffix;
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase(); name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
Edge edge = constructEdge(name, type1); Edge edge = constructEdge(name, type1);
edgesType1.add(doPost("/api/edge", edge, Edge.class)); futures.add(executor.submit(() ->
doPost("/api/edge", edge, Edge.class)));
} }
List<Edge> edgesType1 = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
String title2 = "Edge title 2"; String title2 = "Edge title 2";
String type2 = "typeB"; String type2 = "typeB";
List<Edge> edgesType2 = new ArrayList<>(); cntEntity = 75;
for (int i = 0; i < 75; i++) { futures = new ArrayList<>(cntEntity);
for (int i = 0; i < cntEntity; i++) {
String suffix = StringUtils.randomAlphanumeric(15); String suffix = StringUtils.randomAlphanumeric(15);
String name = title2 + suffix; String name = title2 + suffix;
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase(); name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
Edge edge = constructEdge(name, type2); Edge edge = constructEdge(name, type2);
edgesType2.add(doPost("/api/edge", edge, Edge.class)); futures.add(executor.submit(() ->
doPost("/api/edge", edge, Edge.class)));
} }
List<Edge> edgesType2 = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
List<Edge> loadedEdgesType1 = new ArrayList<>(); List<Edge> loadedEdgesType1 = new ArrayList<>();
PageLink pageLink = new PageLink(15); PageLink pageLink = new PageLink(15);
@ -582,14 +609,17 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
Mockito.reset(tbClusterService, auditLogService); Mockito.reset(tbClusterService, auditLogService);
List<Edge> edges = new ArrayList<>();
int cntEntity = 128; int cntEntity = 128;
futures = new ArrayList<>(cntEntity);
for (int i = 0; i < cntEntity; i++) { for (int i = 0; i < cntEntity; i++) {
Edge edge = constructEdge("Edge" + i, "default"); Edge edge = constructEdge("Edge" + i, "default");
edge = doPost("/api/edge", edge, Edge.class); futures.add(executor.submit(() -> {
edges.add(doPost("/api/customer/" + customerId.getId().toString() Edge edge1 = doPost("/api/edge", edge, Edge.class);
+ "/edge/" + edge.getId().getId().toString(), Edge.class)); return doPost("/api/customer/" + customerId.getId().toString()
+ "/edge/" + edge1.getId().getId().toString(), Edge.class);
}));
} }
List<Edge> edges = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(new Edge(), new Edge(), testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(new Edge(), new Edge(),
savedTenant.getId(), customerId, tenantAdmin.getId(), tenantAdmin.getEmail(), savedTenant.getId(), customerId, tenantAdmin.getId(), tenantAdmin.getEmail(),
@ -622,28 +652,37 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
customer = doPost("/api/customer", customer, Customer.class); customer = doPost("/api/customer", customer, Customer.class);
CustomerId customerId = customer.getId(); CustomerId customerId = customer.getId();
int cntEntity = 125;
String title1 = "Edge title 1"; String title1 = "Edge title 1";
List<Edge> edgesTitle1 = new ArrayList<>(); futures = new ArrayList<>(cntEntity);
for (int i = 0; i < 125; i++) { for (int i = 0; i < cntEntity; i++) {
String suffix = StringUtils.randomAlphanumeric(15); String suffix = StringUtils.randomAlphanumeric(15);
String name = title1 + suffix; String name = title1 + suffix;
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase(); name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
Edge edge = constructEdge(name, "default"); Edge edge = constructEdge(name, "default");
edge = doPost("/api/edge", edge, Edge.class); futures.add(executor.submit(() -> {
edgesTitle1.add(doPost("/api/customer/" + customerId.getId().toString() Edge edge1 = doPost("/api/edge", edge, Edge.class);
+ "/edge/" + edge.getId().getId().toString(), Edge.class)); return doPost("/api/customer/" + customerId.getId().toString()
+ "/edge/" + edge1.getId().getId().toString(), Edge.class);
}));
} }
List<Edge> edgesTitle1 = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
cntEntity = 143;
String title2 = "Edge title 2"; String title2 = "Edge title 2";
List<Edge> edgesTitle2 = new ArrayList<>(); futures = new ArrayList<>(cntEntity);
for (int i = 0; i < 143; i++) { for (int i = 0; i < cntEntity; i++) {
String suffix = StringUtils.randomAlphanumeric(15); String suffix = StringUtils.randomAlphanumeric(15);
String name = title2 + suffix; String name = title2 + suffix;
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase(); name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
Edge edge = constructEdge(name, "default"); Edge edge = constructEdge(name, "default");
edge = doPost("/api/edge", edge, Edge.class); futures.add(executor.submit(() -> {
edgesTitle2.add(doPost("/api/customer/" + customerId.getId().toString() Edge edge1 = doPost("/api/edge", edge, Edge.class);
+ "/edge/" + edge.getId().getId().toString(), Edge.class)); return doPost("/api/customer/" + customerId.getId().toString()
+ "/edge/" + edge1.getId().getId().toString(), Edge.class);
}));
} }
List<Edge> edgesTitle2 = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
List<Edge> loadedEdgesTitle1 = new ArrayList<>(); List<Edge> loadedEdgesTitle1 = new ArrayList<>();
PageLink pageLink = new PageLink(15, 0, title1); PageLink pageLink = new PageLink(15, 0, title1);
@ -687,7 +726,7 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
.andExpect(status().isOk()); .andExpect(status().isOk());
} }
int cntEntity = loadedEdgesTitle1.size(); cntEntity = loadedEdgesTitle1.size();
testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAnyAdditionalInfoAny(new Edge(), new Edge(), testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAnyAdditionalInfoAny(new Edge(), new Edge(),
savedTenant.getId(), customerId, tenantAdmin.getId(), tenantAdmin.getEmail(), savedTenant.getId(), customerId, tenantAdmin.getId(), tenantAdmin.getEmail(),
ActionType.UNASSIGNED_FROM_CUSTOMER, ActionType.UNASSIGNED_FROM_CUSTOMER, cntEntity, cntEntity, 3); ActionType.UNASSIGNED_FROM_CUSTOMER, ActionType.UNASSIGNED_FROM_CUSTOMER, cntEntity, cntEntity, 3);
@ -719,30 +758,39 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
customer = doPost("/api/customer", customer, Customer.class); customer = doPost("/api/customer", customer, Customer.class);
CustomerId customerId = customer.getId(); CustomerId customerId = customer.getId();
int cntEntity = 125;
String title1 = "Edge title 1"; String title1 = "Edge title 1";
String type1 = "typeC"; String type1 = "typeC";
List<Edge> edgesType1 = new ArrayList<>(); futures = new ArrayList<>(cntEntity);
for (int i = 0; i < 125; i++) { for (int i = 0; i < cntEntity; i++) {
String suffix = StringUtils.randomAlphanumeric(15); String suffix = StringUtils.randomAlphanumeric(15);
String name = title1 + suffix; String name = title1 + suffix;
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase(); name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
Edge edge = constructEdge(name, type1); Edge edge = constructEdge(name, type1);
edge = doPost("/api/edge", edge, Edge.class); futures.add(executor.submit(() -> {
edgesType1.add(doPost("/api/customer/" + customerId.getId().toString() Edge edge1 = doPost("/api/edge", edge, Edge.class);
+ "/edge/" + edge.getId().getId().toString(), Edge.class)); return doPost("/api/customer/" + customerId.getId().toString()
+ "/edge/" + edge1.getId().getId().toString(), Edge.class);
}));
} }
List<Edge> edgesType1 = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
cntEntity = 143;
String title2 = "Edge title 2"; String title2 = "Edge title 2";
String type2 = "typeD"; String type2 = "typeD";
List<Edge> edgesType2 = new ArrayList<>(); futures = new ArrayList<>(cntEntity);
for (int i = 0; i < 143; i++) { for (int i = 0; i < cntEntity; i++) {
String suffix = StringUtils.randomAlphanumeric(15); String suffix = StringUtils.randomAlphanumeric(15);
String name = title2 + suffix; String name = title2 + suffix;
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase(); name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
Edge edge = constructEdge(name, type2); Edge edge = constructEdge(name, type2);
edge = doPost("/api/edge", edge, Edge.class); futures.add(executor.submit(() -> {
edgesType2.add(doPost("/api/customer/" + customerId.getId().toString() Edge edge1 = doPost("/api/edge", edge, Edge.class);
+ "/edge/" + edge.getId().getId().toString(), Edge.class)); return doPost("/api/customer/" + customerId.getId().toString()
+ "/edge/" + edge1.getId().getId().toString(), Edge.class);
}));
} }
List<Edge> edgesType2 = new ArrayList<>(Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS));
List<Edge> loadedEdgesType1 = new ArrayList<>(); List<Edge> loadedEdgesType1 = new ArrayList<>();
PageLink pageLink = new PageLink(15, 0, title1); PageLink pageLink = new PageLink(15, 0, title1);