From 65091dd82bd7c0ae63e5d84c4a8fc25f457b7590 Mon Sep 17 00:00:00 2001
From: zbeacon <ibarkov.ua@gmail.com>
Date: Mon, 26 Apr 2021 09:49:16 +0300
Subject: [PATCH] Removed redundant lock on device creating for provisioning
 feature, because of it may cause stucking on high loaded systems

---
 .../device/DeviceProvisionServiceImpl.java    | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java b/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
index 4ba4080a74..053b5150bd 100644
--- a/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
@@ -65,7 +65,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.locks.ReentrantLock;
 
 
 @Service
@@ -78,8 +77,6 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     private static final String DEVICE_PROVISION_STATE = "provisionState";
     private static final String PROVISIONED_STATE = "provisioned";
 
-    private final ReentrantLock deviceCreationLock = new ReentrantLock();
-
     @Autowired
     DeviceDao deviceDao;
 
@@ -177,12 +174,7 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     }
 
     private ProvisionResponse createDevice(ProvisionRequest provisionRequest, DeviceProfile profile) {
-        deviceCreationLock.lock();
-        try {
-            return processCreateDevice(provisionRequest, profile);
-        } finally {
-            deviceCreationLock.unlock();
-        }
+        return processCreateDevice(provisionRequest, profile);
     }
 
     private void notify(Device device, ProvisionRequest provisionRequest, String type, boolean success) {
@@ -191,28 +183,22 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     }
 
     private ProvisionResponse processCreateDevice(ProvisionRequest provisionRequest, DeviceProfile profile) {
-        Device device = deviceService.findDeviceByTenantIdAndName(profile.getTenantId(), provisionRequest.getDeviceName());
         try {
-            if (device == null) {
-                if (StringUtils.isEmpty(provisionRequest.getDeviceName())) {
-                    String newDeviceName = RandomStringUtils.randomAlphanumeric(20);
-                    log.info("Device name not found in provision request. Generated name is: {}", newDeviceName);
-                    provisionRequest.setDeviceName(newDeviceName);
-                }
-                Device savedDevice = deviceService.saveDevice(provisionRequest, profile);
+            if (StringUtils.isEmpty(provisionRequest.getDeviceName())) {
+                String newDeviceName = RandomStringUtils.randomAlphanumeric(20);
+                log.info("Device name not found in provision request. Generated name is: {}", newDeviceName);
+                provisionRequest.setDeviceName(newDeviceName);
+            }
+            Device savedDevice = deviceService.saveDevice(provisionRequest, profile);
 
-                deviceStateService.onDeviceAdded(savedDevice);
-                saveProvisionStateAttribute(savedDevice).get();
-                pushDeviceCreatedEventToRuleEngine(savedDevice);
-                notify(savedDevice, provisionRequest, DataConstants.PROVISION_SUCCESS, true);
+            deviceStateService.onDeviceAdded(savedDevice);
+            saveProvisionStateAttribute(savedDevice).get();
+            pushDeviceCreatedEventToRuleEngine(savedDevice);
+            notify(savedDevice, provisionRequest, DataConstants.PROVISION_SUCCESS, true);
 
-                return new ProvisionResponse(getDeviceCredentials(savedDevice), ProvisionResponseStatus.SUCCESS);
-            } else {
-                log.warn("[{}] The device is already provisioned!", device.getName());
-                notify(device, provisionRequest, DataConstants.PROVISION_FAILURE, false);
-                throw new ProvisionFailedException(ProvisionResponseStatus.FAILURE.name());
-            }
-        } catch (InterruptedException | ExecutionException e) {
+            return new ProvisionResponse(getDeviceCredentials(savedDevice), ProvisionResponseStatus.SUCCESS);
+        } catch (Exception e) {
+            log.warn("[{}] Error during device creation from provision request: [{}]", provisionRequest.getDeviceName(), provisionRequest, e);
             throw new ProvisionFailedException(ProvisionResponseStatus.FAILURE.name());
         }
     }