From 25181bb1c88ac275fed13d8020f2a97380a2b36b Mon Sep 17 00:00:00 2001
From: Artem Barysh <abarysh@thingsboard.io>
Date: Fri, 14 Nov 2025 11:21:35 +0200
Subject: [PATCH] refactoring

---
 .../server/transport/snmp/SnmpTransportContext.java          | 5 -----
 transport/snmp/src/main/resources/tb-snmp-transport.yml      | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/SnmpTransportContext.java b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/SnmpTransportContext.java
index 02140a982b..93ce3d1278 100644
--- a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/SnmpTransportContext.java
+++ b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/SnmpTransportContext.java
@@ -109,11 +109,6 @@ public class SnmpTransportContext extends TransportContext {
                     batchIndex++;
                     break;
                 } catch (Exception e) {
-                    if (e instanceof InterruptedException) {
-                        log.warn("SNMP bootstrap interrupted. Stopping bootstrap task.", e);
-                        return;
-                    }
-
                     if (attempt >= snmpBootstrapBatchRetries) {
                         log.error("SNMP bootstrap: batch {} failed after {} attempts.", batchIndex, attempt, e);
                         return;
diff --git a/transport/snmp/src/main/resources/tb-snmp-transport.yml b/transport/snmp/src/main/resources/tb-snmp-transport.yml
index 79aee31921..567654cce4 100644
--- a/transport/snmp/src/main/resources/tb-snmp-transport.yml
+++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml
@@ -151,6 +151,8 @@ transport:
       ignore_type_cast_errors: "${SNMP_RESPONSE_IGNORE_TYPE_CAST_ERRORS:false}"
     # Thread pool size for scheduler that executes device querying tasks
     scheduler_thread_pool_size: "${SNMP_SCHEDULER_THREAD_POOL_SIZE:4}"
+    # Maximum number of retry attempts for a single SNMP devices batch during bootstrap.
+    batch_retries: "${SNMP_BOOTSTRAP_RETRIES:8}"
   sessions:
     # Session inactivity timeout is a global configuration parameter that defines how long the device transport session will be opened after the last message arrives from the device.
     # The parameter value is in milliseconds.