Merge pull request #24 from yuriy-glotanov/2020.1beta

fix wrong rsync behaviour

Author: interference-project

src/main/java/su/interference/core/SyncFrame.java

@@ -24,6 +24,8 @@ this software and associated documentation files (the "Software"), to deal in
 
 package su.interference.core;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import su.interference.exception.InternalException;
 import su.interference.persistent.*;
 
@@ -38,6 +40,7 @@ this software and associated documentation files (the "Software"), to deal in
 
 public class SyncFrame implements Comparable, Serializable, AllowRPredicate {
 
+    private final static Logger logger = LoggerFactory.getLogger(SyncFrame.class);
     private final byte[] b;
     private final long frameId;
     private final long allocId;
@@ -64,6 +67,7 @@ public SyncFrame(Frame frame, Session s, FreeFrame fb) throws Exception {
         if (bd == null) {
             final FreeFrame fframe = Instance.getInstance().getFreeFrameById(frame.getPtr());
             if (fframe == null) {
+                logger.error(frame.getClass().getSimpleName()+" does not match any system objects");
                 throw new InternalException();
             }
             fframe.setPassed(1);

src/main/java/su/interference/transport/SyncFrameEvent.java

@@ -120,7 +120,6 @@ public synchronized int rframe2(SyncFrame[] sb) throws Exception {
                 //tframes.addAll(b.getTframes());
             }
         }
-        llt.commit();
         //updateTransFrames(tframes, hmap2, s);
 
         final Map<Long, List<Chunk>> umap = new ConcurrentHashMap<>();
@@ -188,6 +187,8 @@ public synchronized int rframe2(SyncFrame[] sb) throws Exception {
             //b.getBd().setFrame(null);
         }
 
+        List<SyncFrame> nframes = new ArrayList<>();
+        List<SyncFrame> lframes = new ArrayList<>();
         for (SyncFrame b : sb) {
             try {
                 if (b.isAllowR()) {
@@ -208,8 +209,14 @@ public synchronized int rframe2(SyncFrame[] sb) throws Exception {
                             frame.setRes05(lcF);
                             frame.setRes06(parentB);
                             frame.setRes07(lcB);
-                            b.getDf().writeFrame(b.getBd(), b.getBd().getPtr(), frame.getFrame(), llt, s);
+                            //b.getDf().writeFrame(b.getBd(), b.getBd().getPtr(), frame.getFrame(), llt, s);
                             b.getBd().setFrame(frame);
+                            if (b.getFrameType() == 1) {
+                                lframes.add(b);
+                            }
+                            if (b.getFrameType() == 2) {
+                                nframes.add(b);
+                            }
                             logger.info("write index frame with allocId "+b.getAllocId()+" ptr "+b.getBd().getPtr());
                         }
                     }
@@ -220,6 +227,15 @@ public synchronized int rframe2(SyncFrame[] sb) throws Exception {
             //b.getBd().setFrame(null);
         }
 
+        for (SyncFrame b : lframes) {
+            b.getDf().writeFrame(b.getBd(), b.getBd().getPtr(), b.getBd().getFrame().getFrame(), llt, s);
+        }
+        for (SyncFrame b : nframes) {
+            b.getDf().writeFrame(b.getBd(), b.getBd().getPtr(), b.getBd().getFrame().getFrame(), llt, s);
+        }
+
+        llt.commit();
+
         final Map<Integer, List<FrameApi>> frames_ = new HashMap<>();
         for (SyncFrame f : sb) {
             if (frames_.get(f.getObjectId()) == null) {