demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

[modbus] Workaround for nrjavaserial issues: do not disconnect serial (#2272)

Browse Source 
Workaround for https://github.com/openhab/openhab-core/issues/1842.
Typically serial connections are disconnected and reconnected on IO
errors. This has turned out to be problematic with the recent
nrjavaserial updates brought by OH3 (locking behaviour of nrjavaserial
seems to be prone to deadlocks).

We workaround the issues by trying to keep the serial connection open
as long as possible.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
This commit is contained in:
Sami Salonen
2021-04-07 20:46:36 +02:00
committed by GitHub
parent 949313744d
commit b1b58436f2
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.io.transport.modbus/src/main/java/org/openhab/core/io/transport/modbus/internal/ModbusManagerImpl.java
+36 -12
View File
@@ -627,9 +627,15 @@ public class ModbusManagerImpl implements ModbusManager {
"Last try {} failed when executing request ({}). Aborting. Error was I/O error, so reseting the connection. Error details: {} {} [operation ID {}]",
tryIndex, request, e.getClass().getName(), e.getMessage(), operationId);
}
// Invalidate connection, and empty (so that new connection is acquired before new retry)
timer.connection.timeConsumer(c -> invalidate(endpoint, c), connection);
connection = Optional.empty();
if (endpoint instanceof ModbusSerialSlaveEndpoint) {
// Workaround for https://github.com/openhab/openhab-core/issues/1842
// Avoid disconnect/re-connect serial interfaces
logger.debug("Skipping invalidation of serial connection to workaround openhab-core#1842.");
} else {
// Invalidate connection, and empty (so that new connection is acquired before new retry)
timer.connection.timeConsumer(c -> invalidate(endpoint, c), connection);
connection = Optional.empty();
}
continue;
} catch (ModbusIOException e) {
lastError.set(new ModbusSlaveIOExceptionImpl(e));
@@ -644,9 +650,15 @@ public class ModbusManagerImpl implements ModbusManager {
"Last try {} failed when executing request ({}). Aborting. Error was I/O error, so reseting the connection. Error details: {} {} [operation ID {}]",
tryIndex, request, e.getClass().getName(), e.getMessage(), operationId);
}
// Invalidate connection, and empty (so that new connection is acquired before new retry)
timer.connection.timeConsumer(c -> invalidate(endpoint, c), connection);
connection = Optional.empty();
if (endpoint instanceof ModbusSerialSlaveEndpoint) {
// Workaround for https://github.com/openhab/openhab-core/issues/1842
// Avoid disconnect/re-connect serial interfaces
logger.debug("Skipping invalidation of serial connection to workaround openhab-core#1842.");
} else {
// Invalidate connection, and empty (so that new connection is acquired before new retry)
timer.connection.timeConsumer(c -> invalidate(endpoint, c), connection);
connection = Optional.empty();
}
continue;
} catch (ModbusSlaveException e) {
lastError.set(new ModbusSlaveErrorResponseExceptionImpl(e));
@@ -674,9 +686,15 @@ public class ModbusManagerImpl implements ModbusManager {
"Last try {} failed when executing request ({}). Aborting. The response did not match the request. Reseting the connection. Error details: {} {} [operation ID {}]",
tryIndex, request, e.getClass().getName(), e.getMessage(), operationId);
}
// Invalidate connection, and empty (so that new connection is acquired before new retry)
timer.connection.timeConsumer(c -> invalidate(endpoint, c), connection);
connection = Optional.empty();
if (endpoint instanceof ModbusSerialSlaveEndpoint) {
// Workaround for https://github.com/openhab/openhab-core/issues/1842
// Avoid disconnect/re-connect serial interfaces
logger.debug("Skipping invalidation of serial connection to workaround openhab-core#1842.");
} else {
// Invalidate connection, and empty (so that new connection is acquired before new retry)
timer.connection.timeConsumer(c -> invalidate(endpoint, c), connection);
connection = Optional.empty();
}
continue;
} catch (ModbusException e) {
lastError.set(e);
@@ -717,9 +735,15 @@ public class ModbusManagerImpl implements ModbusManager {
} catch (InterruptedException e) {
logger.warn("Poll task was canceled -- not executing/proceeding with the poll: {} [operation ID {}]",
e.getMessage(), operationId);
// Invalidate connection, and empty (so that new connection is acquired before new retry)
timer.connection.timeConsumer(c -> invalidate(endpoint, c), connection);
connection = Optional.empty();
if (endpoint instanceof ModbusSerialSlaveEndpoint) {
// Workaround for https://github.com/openhab/openhab-core/issues/1842
// Avoid disconnect/re-connect serial interfaces
logger.debug("Skipping invalidation of serial connection to workaround openhab-core#1842.");
} else {
// Invalidate connection, and empty (so that new connection is acquired before new retry)
timer.connection.timeConsumer(c -> invalidate(endpoint, c), connection);
connection = Optional.empty();
}
} finally {
timer.connection.timeConsumer(c -> returnConnection(endpoint, c), connection);
logger.trace("Connection was returned to the pool, ending operation [operation ID {}]", operationId);