Merge remote-tracking branch 'upstream/master'

application/src/main/data/json/edge/instructions/install/centos/instructions.md

@@ -8,15 +8,15 @@ sudo yum install -y nano wget
 sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 ```
 
-#### Install Java 11 (OpenJDK)
-ThingsBoard service is running on Java 11. Follow these instructions to install OpenJDK 11:
+#### Install Java 17 (OpenJDK)
+ThingsBoard service is running on Java 17. Follow these instructions to install OpenJDK 17:
 
 ```bash
-sudo yum install java-11-openjdk
+sudo yum install java-17-openjdk
 {:copy-code}
 ```
 
-Please don't forget to configure your operating system to use OpenJDK 11 by default.
+Please don't forget to configure your operating system to use OpenJDK 17 by default.
 You can configure which version is the default using the following command:
 
 ```bash
@@ -34,7 +34,7 @@ java -version
 Expected command output is:
 
 ```text
-openjdk version "11.0.xx"
+openjdk version "17.x.xx"
 OpenJDK Runtime Environment (...)
 OpenJDK 64-Bit Server VM (build ...)
 ```
@@ -144,14 +144,14 @@ CREATE DATABASE tb_edge;
 Download installation package:
 
 ```bash
-wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_VERSION}/tb-edge-${TB_EDGE_VERSION}.rpm
+wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.rpm
 {:copy-code}
 ```
 
 Go to the download repository and install ThingsBoard Edge service:
 
 ```bash
-sudo rpm -Uvh tb-edge-${TB_EDGE_VERSION}.rpm
+sudo rpm -Uvh tb-edge-${TB_EDGE_TAG}.rpm
 {:copy-code}
 ```
 

application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md

@@ -1,15 +1,15 @@
 Here is the list of commands, that can be used to quickly install ThingsBoard Edge on Ubuntu Server and connect to the server.
 
-#### Install Java 11 (OpenJDK)
-ThingsBoard service is running on Java 11. Follow these instructions to install OpenJDK 11:
+#### Install Java 17 (OpenJDK)
+ThingsBoard service is running on Java 17. Follow these instructions to install OpenJDK 17:
 
 ```bash
 sudo apt update
-sudo apt install openjdk-11-jdk
+sudo apt install openjdk-17-jdk
 {:copy-code}
 ```
 
-Please don't forget to configure your operating system to use OpenJDK 11 by default.
+Please don't forget to configure your operating system to use OpenJDK 17 by default.
 You can configure which version is the default using the following command:
 
 ```bash
@@ -27,7 +27,7 @@ java -version
 Expected command output is:
 
 ```text
-openjdk version "11.0.xx"
+openjdk version "17.x.xx"
 OpenJDK Runtime Environment (...)
 OpenJDK 64-Bit Server VM (build ...)
 ```
@@ -76,14 +76,14 @@ CREATE DATABASE tb_edge;
 Download installation package:
 
 ```bash
-wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_VERSION}/tb-edge-${TB_EDGE_VERSION}.deb
+wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.deb
 {:copy-code}
 ```
 
 Go to the download repository and install ThingsBoard Edge service:
 
 ```bash
-sudo dpkg -i tb-edge-${TB_EDGE_VERSION}.deb
+sudo dpkg -i tb-edge-${TB_EDGE_TAG}.deb
 {:copy-code}
 ```
 

application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java

@@ -270,14 +270,16 @@ private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) {
                 initRuleChains();
             }
         }
-        if (msg.getEntityId().getEntityType() == EntityType.EDGE) {
+        if (msg.getEntityId().getEntityType() == EntityType.EDGE && isCore) {
             EdgeId edgeId = new EdgeId(msg.getEntityId().getId());
             EdgeRpcService edgeRpcService = systemContext.getEdgeRpcService();
-            if (msg.getEvent() == ComponentLifecycleEvent.DELETED) {
-                edgeRpcService.deleteEdge(tenantId, edgeId);
-            } else if (msg.getEvent() == ComponentLifecycleEvent.UPDATED) {
-                Edge edge = systemContext.getEdgeService().findEdgeById(tenantId, edgeId);
-                edgeRpcService.updateEdge(tenantId, edge);
+            if (edgeRpcService != null) {
+                if (msg.getEvent() == ComponentLifecycleEvent.DELETED) {
+                    edgeRpcService.deleteEdge(tenantId, edgeId);
+                } else if (msg.getEvent() == ComponentLifecycleEvent.UPDATED) {
+                    Edge edge = systemContext.getEdgeService().findEdgeById(tenantId, edgeId);
+                    edgeRpcService.updateEdge(tenantId, edge);
+                }
             }
         }
         if (msg.getEntityId().getEntityType() == EntityType.DEVICE && ComponentLifecycleEvent.DELETED == msg.getEvent() && isMyPartition(msg.getEntityId())) {

application/src/main/java/org/thingsboard/server/controller/AdminController.java

@@ -29,16 +29,13 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Lazy;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -120,6 +117,9 @@ public class AdminController extends BaseController {
     private final SystemInfoService systemInfoService;
     private final AuditLogService auditLogService;
 
+    @Value("${queue.vc.request-timeout:180000}")
+    private int vcRequestTimeout;
+
     @ApiOperation(value = "Get the Administration Settings object using key (getAdminSettings)",
             notes = "Get the Administration Settings object using specified string key. Referencing non-existing key will cause an error." + SYSTEM_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
@@ -301,13 +301,14 @@ public RepositorySettingsInfo getRepositorySettingsInfo() throws Exception {
     @PostMapping("/repositorySettings")
     public DeferredResult<RepositorySettings> saveRepositorySettings(@RequestBody RepositorySettings settings) throws ThingsboardException {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.WRITE);
+        settings.setLocalOnly(false); // only to be used in tests
         ListenableFuture<RepositorySettings> future = versionControlService.saveVersionControlSettings(getTenantId(), settings);
         return wrapFuture(Futures.transform(future, savedSettings -> {
             savedSettings.setPassword(null);
             savedSettings.setPrivateKey(null);
             savedSettings.setPrivateKeyPassword(null);
             return savedSettings;
-        }, MoreExecutors.directExecutor()));
+        }, MoreExecutors.directExecutor()), vcRequestTimeout);
     }
 
     @ApiOperation(value = "Delete repository settings (deleteRepositorySettings)",
@@ -318,7 +319,7 @@ public DeferredResult<RepositorySettings> saveRepositorySettings(@RequestBody Re
     @ResponseStatus(value = HttpStatus.OK)
     public DeferredResult<Void> deleteRepositorySettings() throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.DELETE);
-        return wrapFuture(versionControlService.deleteVersionControlSettings(getTenantId()));
+        return wrapFuture(versionControlService.deleteVersionControlSettings(getTenantId()), vcRequestTimeout);
     }
 
     @ApiOperation(value = "Check repository access (checkRepositoryAccess)",
@@ -329,8 +330,8 @@ public DeferredResult<Void> checkRepositoryAccess(
             @Parameter(description = "A JSON value representing the Repository Settings.")
             @RequestBody RepositorySettings settings) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
-        settings = checkNotNull(settings);
-        return wrapFuture(versionControlService.checkVersionControlAccess(getTenantId(), settings));
+        settings.setLocalOnly(false); // only to be used in tests
+        return wrapFuture(versionControlService.checkVersionControlAccess(getTenantId(), settings), vcRequestTimeout);
     }
 
     @ApiOperation(value = "Get auto commit settings (getAutoCommitSettings)",
@@ -482,4 +483,5 @@ public void codeProcessingUrl(
         adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, adminSettings);
         response.sendRedirect(prevUri);
     }
+
 }