Add changes for 039ece6

MetPX · Jan 10, 2025 · 5ec93a4 · 5ec93a4
1 parent 7088bec
commit 5ec93a4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/_modules/sarracenia/flow.html b/_modules/sarracenia/flow.html
@@ -2002,10 +2002,14 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
                         <span class="bp">self</span><span class="o">.</span><span class="n">worklist</span><span class="o">.</span><span class="n">ok</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
                         <span class="bp">self</span><span class="o">.</span><span class="n">metrics</span><span class="p">[</span><span class="s1">&#39;flow&#39;</span><span class="p">][</span><span class="s1">&#39;transferRxFiles&#39;</span><span class="p">]</span> <span class="o">+=</span> <span class="mi">1</span>
                         <span class="bp">self</span><span class="o">.</span><span class="n">metrics</span><span class="p">[</span><span class="s1">&#39;flow&#39;</span><span class="p">][</span><span class="s1">&#39;transferRxLast&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;report&#39;</span><span class="p">][</span><span class="s1">&#39;timeCompleted&#39;</span><span class="p">]</span>
+                        <span class="k">continue</span>
                     <span class="k">else</span><span class="p">:</span>
                         <span class="c1"># as above...</span>
-                        <span class="bp">self</span><span class="o">.</span><span class="n">reject</span><span class="p">(</span><span class="n">msg</span><span class="p">,</span> <span class="mi">500</span><span class="p">,</span> <span class="s2">&quot;link </span><span class="si">%s</span><span class="s2"> failed&quot;</span> <span class="o">%</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">])</span>
-                    <span class="k">continue</span>
+                        <span class="k">if</span> <span class="s1">&#39;hlink&#39;</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">]:</span>
+                            <span class="bp">self</span><span class="o">.</span><span class="n">reject</span><span class="p">(</span><span class="n">msg</span><span class="p">,</span> <span class="mi">500</span><span class="p">,</span> <span class="s2">&quot;link </span><span class="si">%s</span><span class="s2"> failed&quot;</span> <span class="o">%</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">])</span>
+                            <span class="k">continue</span>
+
+                        <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span> <span class="sa">f</span><span class="s2">&quot;since hard link failed, fall back to copying from source&quot;</span> <span class="p">)</span>
 
             <span class="c1"># all non-files taken care of above... rest of routine is normal file download.</span>
 

diff --git a/_modules/sarracenia/flowcb/mdelaylatest.html b/_modules/sarracenia/flowcb/mdelaylatest.html
@@ -141,11 +141,21 @@ <h1>Source code for sarracenia.flowcb.mdelaylatest</h1><div class="highlight"><p
             <span class="n">new_ok_delay</span> <span class="o">=</span> <span class="p">[]</span>
             <span class="k">for</span> <span class="n">m2</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">ok_delay</span><span class="p">:</span>
                 <span class="k">if</span> <span class="n">m1</span><span class="p">[</span><span class="s1">&#39;relPath&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="n">m2</span><span class="p">[</span><span class="s1">&#39;relPath&#39;</span><span class="p">]:</span>
-                    <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span>
-                        <span class="sa">f</span><span class="s2">&quot;intermediate version suppressed: </span><span class="si">{</span><span class="n">m1</span><span class="p">[</span><span class="s1">&#39;relPath&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
-                    <span class="bp">self</span><span class="o">.</span><span class="n">suppressions</span> <span class="o">+=</span> <span class="mi">1</span>
-                    <span class="n">new_ok_delay</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">m1</span><span class="p">)</span>
-                    <span class="n">worklist</span><span class="o">.</span><span class="n">rejected</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">m2</span><span class="p">)</span>
+                    <span class="c1"># an mkdir, rmdir, an rm, a rename, an ln: order important, publish immediately.</span>
+                    <span class="k">if</span> <span class="p">(</span><span class="s1">&#39;fileOp&#39;</span> <span class="ow">in</span> <span class="n">m2</span><span class="p">)</span> <span class="ow">or</span> <span class="p">(</span><span class="s1">&#39;fileOp&#39;</span> <span class="ow">in</span> <span class="n">m1</span><span class="p">):</span>  
+                        <span class="k">if</span> <span class="s1">&#39;fileOp&#39;</span> <span class="ow">in</span> <span class="n">m2</span><span class="p">:</span>
+                            <span class="n">op</span><span class="o">=</span><span class="n">m2</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">]</span>
+                        <span class="k">else</span><span class="p">:</span>
+                            <span class="n">op</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;being later: </span><span class="si">{</span><span class="n">m1</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">&quot;</span>
+
+                        <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span> <span class="sa">f</span><span class="s2">&quot;critically ordered operation: </span><span class="si">{</span><span class="n">m2</span><span class="p">[</span><span class="s1">&#39;relPath&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2"> </span><span class="si">{</span><span class="n">op</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
+                        <span class="n">new_incoming</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">m2</span><span class="p">)</span>
+                        <span class="n">new_ok_delay</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">m1</span><span class="p">)</span>
+                    <span class="k">else</span><span class="p">:</span>
+                        <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span> <span class="sa">f</span><span class="s2">&quot;intermediate version suppressed: </span><span class="si">{</span><span class="n">m1</span><span class="p">[</span><span class="s1">&#39;relPath&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
+                        <span class="bp">self</span><span class="o">.</span><span class="n">suppressions</span> <span class="o">+=</span> <span class="mi">1</span>
+                        <span class="n">new_ok_delay</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">m1</span><span class="p">)</span>
+                        <span class="n">worklist</span><span class="o">.</span><span class="n">rejected</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">m2</span><span class="p">)</span>
                     <span class="n">wait</span> <span class="o">=</span> <span class="kc">True</span>
                 <span class="k">else</span><span class="p">:</span>
                     <span class="n">new_ok_delay</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">m2</span><span class="p">)</span>