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

Update vc task timeout error message

Browse Source
This commit is contained in:
ViacheslavKlimov 2024-06-25 11:48:34 +03:00
parent c4155fb706
commit 7310c62e4d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
View File

@ -164,13 +164,13 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
var cacheEntry = taskCache.get(requestId); var cacheEntry = taskCache.get(requestId);
if (cacheEntry == null || cacheEntry.get() == null) { if (cacheEntry == null || cacheEntry.get() == null) {
log.debug("[{}] No cache record: {}", requestId, cacheEntry); log.debug("[{}] No cache record: {}", requestId, cacheEntry);
throw new ThingsboardException(ThingsboardErrorCode.ITEM_NOT_FOUND); throw new ThingsboardException("Task execution timed-out", ThingsboardErrorCode.ITEM_NOT_FOUND);
} else { } else {
var entry = cacheEntry.get(); var entry = cacheEntry.get();
log.trace("[{}] Cache get: {}", requestId, entry); log.trace("[{}] Cache get: {}", requestId, entry);
var result = getter.apply(entry); var result = getter.apply(entry);
if (result == null) { if (result == null) {
throw new ThingsboardException(ThingsboardErrorCode.BAD_REQUEST_PARAMS); throw new ThingsboardException("Invalid task", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
} else { } else {
return result; return result;
} }

4
application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java
View File

@ -668,7 +668,7 @@ public class VersionControlTest extends AbstractControllerTest {
private String createVersion(VersionCreateRequest request) throws Exception { private String createVersion(VersionCreateRequest request) throws Exception {
UUID requestId = doPostAsync("/api/entities/vc/version", request, UUID.class, status().isOk()); UUID requestId = doPostAsync("/api/entities/vc/version", request, UUID.class, status().isOk());
VersionCreationResult result = await().atMost(30, TimeUnit.SECONDS) VersionCreationResult result = await().atMost(60, TimeUnit.SECONDS)
.until(() -> doGet("/api/entities/vc/version/" + requestId + "/status", VersionCreationResult.class), r -> { .until(() -> doGet("/api/entities/vc/version/" + requestId + "/status", VersionCreationResult.class), r -> {
if (r.getError() != null) { if (r.getError() != null) {
throw new RuntimeException("Failed to create version '" + request.getVersionName() + "': " + r.getError()); throw new RuntimeException("Failed to create version '" + request.getVersionName() + "': " + r.getError());
@ -701,7 +701,7 @@ public class VersionControlTest extends AbstractControllerTest {
}))); })));
UUID requestId = doPost("/api/entities/vc/entity", request, UUID.class); UUID requestId = doPost("/api/entities/vc/entity", request, UUID.class);
VersionLoadResult result = await().atMost(30, TimeUnit.SECONDS) VersionLoadResult result = await().atMost(60, TimeUnit.SECONDS)
.until(() -> doGet("/api/entities/vc/entity/" + requestId + "/status", VersionLoadResult.class), VersionLoadResult::isDone); .until(() -> doGet("/api/entities/vc/entity/" + requestId + "/status", VersionLoadResult.class), VersionLoadResult::isDone);
if (result.getError() != null) { if (result.getError() != null) {
throw new RuntimeException("Failed to load version: " + result); throw new RuntimeException("Failed to load version: " + result);