Explorar o código

!320 merge
Merge pull request !320 from AE86/v_2.0

AE86 hai 5 meses
pai
achega
6f04af0238

+ 7 - 1
dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java

@@ -38,7 +38,13 @@ public class ManagerFactory implements ApplicationListener<ClosedEvent> {
         // 标记运行中
         changeMetaState(mapping.getMetaId(), MetaEnum.RUNNING);
 
-        puller.start(mapping);
+        try {
+            puller.start(mapping);
+        } catch (Exception e) {
+            // rollback
+            changeMetaState(mapping.getMetaId(), MetaEnum.READY);
+            throw new ManagerException(e.getMessage());
+        }
     }
 
     public void close(Mapping mapping) {

+ 1 - 1
dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/IncrementPuller.java

@@ -88,7 +88,7 @@ public final class IncrementPuller extends AbstractPuller implements Application
         Connector connector = profileComponent.getConnector(mapping.getSourceConnectorId());
         Assert.notNull(connector, "连接器不能为空.");
         List<TableGroup> list = profileComponent.getSortedTableGroupAll(mappingId);
-        Assert.notEmpty(list, "映射关系不能为空.");
+        Assert.notEmpty(list, "映射关系不能为空,请先添加源表到目标表关系.");
         Meta meta = profileComponent.getMeta(metaId);
         Assert.notNull(meta, "Meta不能为空.");