[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

Am 04.01.24 um 15:36 schrieb Brown, James William:
> On 1/4/2024 7:46 AM, Stefan Metzmacher wrote:
> 
> @@ -3905,7 +3937,24 @@ static int moveip(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
>                  return ret;
>          }
> 
> -       return 0;
> +       /*
> +        * It isn't strictly necessary to wait until takeover runs are
> +        * re-enabled but doing so can't hurt.
> +        */
> +       ret = disable_takeover_runs(mem_ctx,
> +                                   ctdb,
> +                                   0,
> +                                   connected_pnn,
> +                                   connected_count);
> +       if (ret != 0) {
> +               fprintf(stderr, "Failed to enable takeover runs\n");
> +               return ret;
> +       }
> 
> Message should be "Failed to disable takeover runs\n" like previous change at 3886.

This is a bit confusing but correct, the function name is strange.

We have "disable" with a timeout of 2*options.timelimit
and "enable" with a timeout of 0.

metze