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

Transaction timeout for finding entities by request and importing entities batch

Browse Source
This commit is contained in:
Viacheslav Klimov 2022-04-26 12:08:28 +03:00
parent ba1ea35210
commit a1d62373c9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
View File

@ -70,7 +70,7 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class, timeout = 120)
@Override @Override
public List<EntityImportResult<?>> importEntities(SecurityUser user, List<EntityExportData<?>> exportDataList, EntityImportSettings importSettings) throws ThingsboardException { public List<EntityImportResult<?>> importEntities(SecurityUser user, List<EntityExportData<?>> exportDataList, EntityImportSettings importSettings) throws ThingsboardException {
fixOrder(exportDataList); fixOrder(exportDataList);

2
application/src/main/java/org/thingsboard/server/service/sync/exporting/DefaultExportableEntitiesService.java
View File

@ -21,6 +21,7 @@ import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.ExportableEntity; import org.thingsboard.server.common.data.ExportableEntity;
import org.thingsboard.server.common.data.HasTenantId; import org.thingsboard.server.common.data.HasTenantId;
@ -130,6 +131,7 @@ public class DefaultExportableEntitiesService implements ExportableEntitiesServi
} }
@Transactional(readOnly = true, timeout = 40)
@Override @Override
public List<EntityId> findEntitiesForRequest(TenantId tenantId, ExportRequest request) { public List<EntityId> findEntitiesForRequest(TenantId tenantId, ExportRequest request) {
switch (request.getType()) { switch (request.getType()) {