Merge pull request #61 from zendesk/ben/recover_from_lost_cx

recover from lost cx
zendesk · Jun 16, 2015 · 91b4ba5 · 91b4ba5
2 parents 593a0b5 + b00114f
commit 91b4ba5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
     	<groupId>com.zendesk</groupId>
     	<artifactId>open-replicator</artifactId>
-    	<version>1.2.0</version>
+    	<version>1.2.1</version>
     </dependency>
     <dependency>
     	<groupId>net.sf.jopt-simple</groupId>

diff --git a/src/main/java/com/zendesk/maxwell/MaxwellBinlogEventListener.java b/src/main/java/com/zendesk/maxwell/MaxwellBinlogEventListener.java
@@ -18,6 +18,7 @@ public void stop() {
 		mustStop.set(true);
 	}
 
+	@Override
 	public void onEvents(BinlogEventV4 event) {
 		while (mustStop.get() != true) {
 			try {

diff --git a/src/main/java/com/zendesk/maxwell/MaxwellParser.java b/src/main/java/com/zendesk/maxwell/MaxwellParser.java
@@ -92,13 +92,23 @@ public void run() throws Exception {
 
 		for(;;) {
 			event = getEvent();
+
+			if ( !replicator.isRunning() ) {
+				LOGGER.warn("open-replicator stopped at position " + replicator.getBinlogFileName() + ":" + replicator.getBinlogPosition() + " -- restarting");
+				replicator.start();
+			}
+
 			if ( event == null )
 				continue;
 
 			if ( !skipEvent(event)) {
 				producer.push(event);
-				// TODO:  we need to tell the producer to only store a stop-event on table-maps
+				// TODO:  we need to tell the producer to only store a stop-event on table-maps; otherwise we can end up
+				// in the middle of multiple row events, which is a bug.
 			}
+
+			replicator.setBinlogFileName(event.getBinlogFilename());
+			replicator.setBinlogPosition(event.getHeader().getNextPosition());
 		}
 	}