[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  600cec4 ctdb-recovery: Terminate if recovery fails without any banning credits
       via  1847556 ctdb-recovery-helper: Fix a comment
      from  9316a80 s3-libnet: Add a comment to make cleaŕ we want to fall through

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 600cec4d44a01391230a81efeece5155a97c8298
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Jun 23 21:07:37 2016 +1000

    ctdb-recovery: Terminate if recovery fails without any banning credits
    
    In case of database recovery failure, if there are no banning credits
    assigned, then the async computation is never terminated.  The else
    condition is missing in (max_credits >= NUM_RETRIES) check.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Fri Jun 24 09:56:23 CEST 2016 on sn-devel-144

commit 18475565623210b0a7ed59298b9bf70a288c39e4
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Jun 8 17:25:42 2016 +1000

    ctdb-recovery-helper: Fix a comment
    
    The sequence of events are incorrectly documented.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/server/ctdb_recovery_helper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c
index d54f32d..6b487b9 100644
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -2079,8 +2079,8 @@ static bool db_recovery_recv(struct tevent_req *req, int *count)
  * - Send START_RECOVERY
  * - Update vnnmap on all nodes
  * - Run database recovery
- * - Send END_RECOVERY
  * - Set RECOVERY_NORMAL
+ * - Send END_RECOVERY
  */
 
 struct recovery_state {
@@ -2609,6 +2609,8 @@ static void recovery_db_recovery_done(struct tevent_req *subreq)
 			}
 			tevent_req_set_callback(subreq, recovery_failed_done,
 						req);
+		} else {
+			tevent_req_error(req, EIO);
 		}
 		return;
 	}


-- 
Samba Shared Repository