|
|
|
@ -11,6 +11,7 @@ import ( |
|
|
|
|
"strconv" |
|
|
|
|
|
|
|
|
|
"code.betamike.com/cryptic-io/pmux/pmuxlib" |
|
|
|
|
"github.com/mediocregopher/mediocre-go-lib/v2/mctx" |
|
|
|
|
"github.com/mediocregopher/mediocre-go-lib/v2/mlog" |
|
|
|
|
) |
|
|
|
|
|
|
|
|
@ -57,7 +58,7 @@ func waitForGarageAndNebula( |
|
|
|
|
return nil |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
logger = garageAdminClientLogger(logger) |
|
|
|
|
adminClientLogger := garageAdminClientLogger(logger) |
|
|
|
|
|
|
|
|
|
for _, alloc := range allocs { |
|
|
|
|
|
|
|
|
@ -69,9 +70,12 @@ func waitForGarageAndNebula( |
|
|
|
|
adminClient := garage.NewAdminClient( |
|
|
|
|
adminAddr, |
|
|
|
|
hostBootstrap.Garage.AdminToken, |
|
|
|
|
logger, |
|
|
|
|
adminClientLogger, |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
ctx := mctx.Annotate(ctx, "garage-admin-addr", adminAddr) |
|
|
|
|
logger.Debug(ctx, "wating for garage instance to start") |
|
|
|
|
|
|
|
|
|
if err := adminClient.Wait(ctx); err != nil { |
|
|
|
|
return fmt.Errorf("waiting for garage instance %q to start up: %w", adminAddr, err) |
|
|
|
|
} |
|
|
|
|