repair: fix forest and fec chainer publish edge cases

Author: emwang-jump

src/discof/forest/fd_forest.c

@@ -190,14 +190,14 @@ fd_forest_verify( fd_forest_t const * forest ) {
 /* query queries for a connected ele keyed by slot.  does not return
    orphaned ele. */
 
-static fd_forest_ele_t *
-ancestry_frontier_query( fd_forest_t * forest, ulong slot ) {
-  fd_forest_ele_t * pool = fd_forest_pool( forest );
-  fd_forest_ele_t * ele  = NULL;
-  ele =                  fd_forest_ancestry_ele_query( fd_forest_ancestry( forest ), &slot, NULL, pool );
-  ele = fd_ptr_if( !ele, fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &slot, NULL, pool ), ele );
-  return ele;
-}
+//static fd_forest_ele_t * FD_FN_UNUSED
+//ancestry_frontier_query( fd_forest_t * forest, ulong slot ) {
+  //fd_forest_ele_t * pool = fd_forest_pool( forest );
+  //fd_forest_ele_t * ele  = NULL;
+  //ele =                  fd_forest_ancestry_ele_query( fd_forest_ancestry( forest ), &slot, NULL, pool );
+  //ele = fd_ptr_if( !ele, fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &slot, NULL, pool ), ele );
+  //return ele;
+//}
 
 /* remove removes and returns a connected ele from ancestry or frontier
    maps.  does not remove orphaned ele.  does not unlink ele. */
@@ -352,6 +352,9 @@ insert( fd_forest_t * forest, ulong slot, ushort parent_off ) {
 # if FD_FOREST_USE_HANDHOLDING
   FD_TEST( parent_off <= slot );                   /* caller err - inval */
   FD_TEST( fd_forest_pool_free( pool ) );          /* impl err - oom */
+  if ( slot <= fd_forest_root_slot( forest ) ) {
+    __asm__("int $3");
+  }
   FD_TEST( slot > fd_forest_root_slot( forest ) ); /* caller error - inval */
 # endif
 
@@ -381,9 +384,6 @@ insert( fd_forest_t * forest, ulong slot, ushort parent_off ) {
 
 fd_forest_ele_t *
 fd_forest_query( fd_forest_t * forest, ulong slot ) {
-# if FD_FOREST_USE_HANDHOLDING
-  FD_TEST( slot > fd_forest_root_slot( forest ) ); /* caller error - inval */
-# endif
   return query( forest, slot );
 }
 
@@ -432,22 +432,39 @@ fd_forest_publish( fd_forest_t * forest, ulong new_root_slot ) {
 
   fd_forest_ancestry_t * ancestry = fd_forest_ancestry( forest );
   fd_forest_frontier_t * frontier = fd_forest_frontier( forest );
+  fd_forest_orphaned_t * orphaned = fd_forest_orphaned( forest );
   fd_forest_ele_t *      pool     = fd_forest_pool( forest );
   ulong                  null     = fd_forest_pool_idx_null( pool );
 
   fd_forest_ele_t * old_root_ele = fd_forest_pool_ele( pool, forest->root );
-  fd_forest_ele_t * new_root_ele = ancestry_frontier_query( forest, new_root_slot );
+  fd_forest_ele_t * new_root_ele = query( forest, new_root_slot );
 
-# if FD_FOREST_USE_HANDHOLDING
-  FD_TEST( new_root_ele );                            /* caller error - not found */
-  FD_TEST( new_root_ele->slot > old_root_ele->slot ); /* caller error - inval */
-# endif
+#if FD_FOREST_USE_HANDHOLDING
+  if( FD_LIKELY( new_root_ele ) ) {
+    FD_TEST( new_root_ele->slot > old_root_ele->slot ); /* caller error - inval */
+  }
+#endif
+
+  /* Edge case where if we haven't been getting repairs, and we have a
+     gap between the root and orphans. we publish forward to a slot that
+     we don't have. This only case this should be happening is when we
+     load a second incremental and that incremental slot lives in the
+     gap. In that case this isn't a bug, but we should be treating this
+     new root like the snapshot slot / init root. Should be happening
+     very rarely given a well-functioning repair.  */
+
+  if( FD_UNLIKELY( !new_root_ele ) ) {
+    new_root_ele = acquire( forest, new_root_slot );
+    new_root_ele->complete_idx = 0;
+    new_root_ele->buffered_idx = 0;
+    fd_forest_frontier_ele_insert( frontier, new_root_ele, pool );
+  }
 
   /* First, remove the previous root, and add it to a FIFO prune queue.
      head points to the queue head (initialized with old_root_ele). */
 
   fd_forest_ele_t * head = ancestry_frontier_remove( forest, old_root_ele->slot );
-  head->next             = null;
+  head->prev             = null;
   fd_forest_ele_t * tail = head;
 
   /* Second, BFS down the tree, inserting each ele into the prune queue
@@ -460,22 +477,85 @@ fd_forest_publish( fd_forest_t * forest, ulong new_root_slot ) {
       if( FD_LIKELY( child != new_root_ele ) ) { /* do not prune new root or descendants */
         ulong idx  = fd_forest_ancestry_idx_remove( ancestry, &child->slot, null, pool );
         idx        = fd_ulong_if( idx != null, idx, fd_forest_frontier_idx_remove( frontier, &child->slot, null, pool ) );
-        tail->next = idx; /* insert prune queue */
+        tail->prev = idx; /* insert prune queue */
 #       if FD_FOREST_USE_HANDHOLDING
-        FD_TEST( tail->next != null ); /* programming error in BFS */
+        FD_TEST( tail->prev != null ); /* programming error in BFS */
 #       endif
-        tail       = fd_forest_pool_ele( pool, tail->next ); /* advance prune queue */
-        tail->next = null;
+        tail       = fd_forest_pool_ele( pool, tail->prev ); /* advance prune queue */
+        tail->prev = null;
       }
       child = fd_forest_pool_ele( pool, child->sibling );
     }
-    fd_forest_ele_t * next = fd_forest_pool_ele( pool, head->next ); /* FIFO pop */
+    fd_forest_ele_t * next = fd_forest_pool_ele( pool, head->prev ); /* FIFO pop */
     fd_forest_pool_ele_release( pool, head ); /* free head */
     head = next;
   }
 
+  /* If there is nothing on the frontier, we have hit an edge case
+     during catching up where all of our frontiers were < the new root.
+     In that case we need to continue repairing from the new root, so
+     add it to the frontier. */
+
+  if( FD_UNLIKELY( fd_forest_frontier_iter_done( fd_forest_frontier_iter_init( frontier, pool ), frontier, pool ) ) ) {
+    fd_forest_ele_t * remove = fd_forest_ancestry_ele_remove( ancestry, &new_root_ele->slot, NULL, pool );
+    if( FD_UNLIKELY( !remove ) ) {
+      /* Very rare case where during boot we could publish to an orphaned slot */
+      remove = fd_forest_orphaned_ele_remove( orphaned, &new_root_ele->slot, NULL, pool );
+    }
+    FD_TEST( remove == new_root_ele );
+    fd_forest_frontier_ele_insert( frontier, new_root_ele, pool );
+    new_root_ele->complete_idx = 0;
+    new_root_ele->buffered_idx = 0;
+    advance_frontier( forest, new_root_ele->slot, 0 );
+  }
+
   new_root_ele->parent = null; /* unlink new root from parent */
-  forest->root     = fd_forest_ancestry_idx_query( ancestry, &new_root_slot, null, pool );
+  forest->root         = fd_forest_pool_idx( pool, new_root_ele );
+
+  FD_TEST( !fd_forest_verify( forest ) );
+
+  /* Lastly, cleanup orphans if there orphan heads < new_root_slot.
+     First, add any relevant orphans to the prune queue. FIXME: NEED TO REMOVE BEFORE MODIFYING NEXT PTR */
+
+  head = NULL;
+  for( fd_forest_orphaned_iter_t iter = fd_forest_orphaned_iter_init( orphaned, pool );
+       !fd_forest_orphaned_iter_done( iter, orphaned, pool );
+       iter = fd_forest_orphaned_iter_next( iter, orphaned, pool ) ) {
+    fd_forest_ele_t * ele = fd_forest_orphaned_iter_ele( iter, orphaned, pool );
+    if( FD_UNLIKELY( ele->slot < new_root_slot ) ) {
+      if( FD_UNLIKELY( !head ) ) {
+        head = ele;
+        head->prev = null;
+        tail = ele;
+      } else {
+        tail->prev = iter.ele_idx;
+        tail = fd_forest_pool_ele( pool, tail->prev );
+        tail->prev = null;
+      }
+    }
+  }
+
+  FD_TEST( !fd_forest_verify( forest ) );
+
+
+  /* Now BFS and clean up children of these orphan heads */
+  while( head ) {
+    fd_forest_ele_t * child = fd_forest_pool_ele( pool, head->child );
+    while( FD_LIKELY( child ) ) {
+      if( FD_LIKELY( child != new_root_ele ) ) {
+        tail->prev = fd_forest_pool_idx( pool, child ); /* insert prune queue */
+        tail       = fd_forest_pool_ele( pool, tail->prev ); /* advance prune queue */
+        tail->prev = null;
+      }
+      child = fd_forest_pool_ele( pool, child->sibling );
+    }
+    ulong remove = fd_forest_orphaned_idx_remove( orphaned, &head->slot, null, pool ); /* remove myself */
+    remove = fd_ulong_if( remove == null, fd_forest_ancestry_idx_remove( ancestry, &head->slot, null, pool ), remove );
+
+    fd_forest_ele_t * next = fd_forest_pool_ele( pool, head->prev ); /* FIFO pop */
+    fd_forest_pool_ele_release( pool, head ); /* free head */
+    head = next;
+  }
   return new_root_ele;
 }
 

src/discof/forest/fd_forest.h

@@ -45,7 +45,7 @@
 
 struct __attribute__((aligned(128UL))) fd_forest_ele {
   ulong slot;     /* map key */
-  ulong prev;     /* internal use by link_orphans */
+  ulong prev;     /* internal use by fd_forest_publish */
   ulong next;     /* internal use by fd_pool, fd_map_chain */
   ulong parent;   /* pool idx of the parent in the tree */
   ulong child;    /* pool idx of the left-child */

src/discof/forest/test_forest.c

@@ -71,14 +71,126 @@ test_publish( fd_wksp_t * wksp ) {
     fd_forest_t * forest = fd_forest_join( fd_forest_new( mem, ele_max, 42UL /* seed */ ) );
 
     FD_TEST( forest );
-    fd_forest_publish( setup_preorder( forest ), publish_test_cases[i] );
+    setup_preorder( forest );
+    fd_forest_publish( forest, publish_test_cases[i] );
     FD_TEST( !fd_forest_verify( forest ) );
     // fd_forest_print( forest );
 
     fd_wksp_free_laddr( fd_forest_delete( fd_forest_leave( fd_forest_fini( forest ) ) ) );
   }
 }
 
+void
+test_publish_incremental( fd_wksp_t * wksp ){
+  /* as the name suggests. tests the complications introduced by loading
+     two incremental snapshots */
+
+  ulong ele_max = 8UL;
+  void * mem = fd_wksp_alloc_laddr( wksp, fd_forest_align(), fd_forest_footprint( ele_max ), 1UL );
+  FD_TEST( mem );
+  fd_forest_t * forest = fd_forest_join( fd_forest_new( mem, ele_max, 42UL /* seed */ ) );
+
+  /* 1. Try publishing to a slot that doesnt exist
+
+      0          10 -> 11
+
+   */
+
+  fd_forest_init( forest, 0 );
+  fd_forest_data_shred_insert( forest, 11, 1, 0, 0, 1, 1 );
+
+  ulong new_root = 1;
+  fd_forest_publish( forest, new_root );
+  FD_TEST( fd_forest_root_slot( forest ) == new_root );
+  FD_TEST( fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &new_root, NULL, fd_forest_pool( forest ) ) );
+  FD_TEST( !fd_forest_query( forest, 0 ) );
+
+  /* 2. Try publishing to a slot on the frontier
+
+    1 -> 2 -> 3       10 -> 11
+
+  */
+
+  fd_forest_data_shred_insert( forest, 2, 1, 0, 0, 1, 1 );
+  fd_forest_data_shred_insert( forest, 3, 1, 0, 0, 1, 1 );
+
+  ulong frontier = 3;
+  FD_TEST( fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &frontier, NULL, fd_forest_pool( forest ) ) );
+  fd_forest_publish( forest, frontier );
+  FD_TEST( fd_forest_root_slot( forest ) == frontier );
+  FD_TEST( fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &frontier, NULL, fd_forest_pool( forest ) ) );
+  FD_TEST( !fd_forest_query( forest, 1 ) );
+  FD_TEST( !fd_forest_query( forest, 2 ) );
+  FD_TEST( fd_forest_query( forest, 10 ) );
+  FD_TEST( fd_forest_query( forest, 11 ) );
+
+  /* 3. Try publishing to a slot in ancestry but in front of the frontier
+
+      frontier    new_root
+    3 -> 4 -> 5 -> 6 -> 7      10 -> 11
+
+  */
+
+  fd_forest_data_shred_insert( forest, 4, 1, 0, 0, 0, 0 );
+  fd_forest_data_shred_insert( forest, 5, 1, 0, 0, 0, 0 );
+  fd_forest_data_shred_insert( forest, 6, 1, 0, 0, 0, 0 );
+  fd_forest_data_shred_insert( forest, 7, 1, 0, 0, 0, 0 );
+
+  frontier = 4;
+  new_root = 6;
+  FD_TEST( fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &frontier, NULL, fd_forest_pool( forest ) ) );
+  fd_forest_publish( forest, new_root );
+  FD_TEST( fd_forest_root_slot( forest ) == new_root );
+  frontier = 7;
+  FD_TEST( fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &frontier, NULL, fd_forest_pool( forest ) ) );
+  FD_TEST( !fd_forest_query( forest, 3 ) );
+  FD_TEST( !fd_forest_query( forest, 4 ) );
+  FD_TEST( !fd_forest_query( forest, 5 ) );
+
+  /* 4. Try publishing to an orphan slot
+
+  6 -> 7       10 -> 11
+               8 -> 9 (should get pruned)
+  */
+
+  fd_forest_data_shred_insert( forest, 9, 1, 0, 0, 0, 0 );
+
+  new_root = 10;
+  frontier = 11;
+  fd_forest_print( forest );
+
+  fd_forest_publish( forest, new_root);
+  FD_TEST( !fd_forest_verify( forest ) );
+  FD_TEST( fd_forest_root_slot( forest ) == new_root );
+  fd_forest_print( forest );
+  FD_TEST( fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &frontier, NULL, fd_forest_pool( forest ) ) );
+  FD_TEST( !fd_forest_query( forest, 6 ) );
+  FD_TEST( !fd_forest_query( forest, 7 ) );
+  FD_TEST( !fd_forest_query( forest, 8 ) );
+  FD_TEST( !fd_forest_query( forest, 9 ) );
+  FD_TEST( fd_forest_query( forest, 10 ) );
+  FD_TEST( fd_forest_query( forest, 11 ) );
+
+  /* 5. Try publishing to an orphan slot that is not a "head" of orphans
+                            (publish)
+    10 -> 11         14 -> 15 -> 16
+
+  */
+
+  fd_forest_data_shred_insert( forest, 14, 1, 0, 0, 0, 0 );
+  fd_forest_data_shred_insert( forest, 15, 1, 0, 0, 0, 0 );
+  fd_forest_data_shred_insert( forest, 16, 1, 0, 0, 0, 0 );
+
+  new_root = 15;
+  frontier = 16;
+  fd_forest_publish( forest, new_root );
+  FD_TEST( !fd_forest_verify( forest ) );
+  FD_TEST( fd_forest_root_slot( forest ) == new_root );
+  FD_TEST( fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &frontier, NULL, fd_forest_pool( forest ) ) );
+  FD_TEST( !fd_forest_query( forest, 10 ) );
+  FD_TEST( !fd_forest_query( forest, 11 ) );
+  FD_TEST( !fd_forest_query( forest, 14 ) );
+}
 #define SORT_NAME        sort
 #define SORT_KEY_T       ulong
 #include "../../util/tmpl/fd_sort.c"
@@ -520,6 +632,7 @@ main( int argc, char ** argv ) {
   FD_TEST( wksp );
 
   test_publish( wksp );
+  test_publish_incremental( wksp );
   test_out_of_order( wksp );
   test_forks( wksp );
   // test_print_tree( wksp );