chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue #296, support getWithoutAck/ack/rollback for NPE

Browse Source
This commit is contained in:
七锋
2018-07-16 23:00:35 +08:00
parent c1805a4831
commit bef6a66eaf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/com/alibaba/otter/canal/client/impl/ClusterCanalConnector.java
View File

@@ -184,7 +184,7 @@ public class ClusterCanalConnector implements CanalConnector {
return msg; return msg;
} catch (Throwable t) { } catch (Throwable t) {
logger.warn(String.format("something goes wrong when getWithoutAck data from server:%s", logger.warn(String.format("something goes wrong when getWithoutAck data from server:%s",
currentConnector.getAddress()), t); currentConnector != null ? currentConnector.getAddress() : "null"), t);
times++; times++;
restart(); restart();
logger.info("restart the connector for next round retry."); logger.info("restart the connector for next round retry.");
@@ -201,7 +201,7 @@ public class ClusterCanalConnector implements CanalConnector {
return msg; return msg;
} catch (Throwable t) { } catch (Throwable t) {
logger.warn(String.format("something goes wrong when getWithoutAck data from server:%s", logger.warn(String.format("something goes wrong when getWithoutAck data from server:%s",
currentConnector.getAddress()), t); currentConnector != null ? currentConnector.getAddress() : "null"), t);
times++; times++;
restart(); restart();
logger.info("restart the connector for next round retry."); logger.info("restart the connector for next round retry.");
@@ -218,7 +218,7 @@ public class ClusterCanalConnector implements CanalConnector {
return; return;
} catch (Throwable t) { } catch (Throwable t) {
logger.warn(String.format("something goes wrong when rollbacking data from server:%s", logger.warn(String.format("something goes wrong when rollbacking data from server:%s",
currentConnector.getAddress()), currentConnector != null ? currentConnector.getAddress() : "null"),
t); t);
times++; times++;
restart(); restart();
@@ -236,7 +236,7 @@ public class ClusterCanalConnector implements CanalConnector {
return; return;
} catch (Throwable t) { } catch (Throwable t) {
logger.warn(String.format("something goes wrong when rollbacking data from server:%s", logger.warn(String.format("something goes wrong when rollbacking data from server:%s",
currentConnector.getAddress()), currentConnector != null ? currentConnector.getAddress() : "null"),
t); t);
times++; times++;
restart(); restart();
@@ -255,7 +255,7 @@ public class ClusterCanalConnector implements CanalConnector {
return; return;
} catch (Throwable t) { } catch (Throwable t) {
logger.warn(String.format("something goes wrong when acking data from server:%s", logger.warn(String.format("something goes wrong when acking data from server:%s",
currentConnector.getAddress()), currentConnector != null ? currentConnector.getAddress() : "null"),
t); t);
times++; times++;
restart(); restart();