Skip to content

skipping unreachable containers when deploying zdbs #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

skipping unreachable containers when deploying zdbs #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions pkg/primitives/zdb/zdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func (p *Manager) zdbProvisionImpl(ctx context.Context, wl *gridtypes.WorkloadWi
if err != nil {
return zos.ZDBResult{}, errors.Wrap(err, "failed to find IP address on zdb0 interface")
}

log.Info().Msg("found a container matching this namespace of the requested zdb")
return zos.ZDBResult{
Namespace: nsID,
IPs: ipsToString(containerIPs),
Expand All @@ -189,8 +189,24 @@ func (p *Manager) zdbProvisionImpl(ctx context.Context, wl *gridtypes.WorkloadWi

var cont tZDBContainer
if len(candidates) > 0 {
cont = candidates[0]
} else {
// try to find the first reachable zdb instance
for _, c := range candidates {
cl := zdbConnection(pkg.ContainerID(c.Name))
if err := cl.Connect(); err == nil {
_ = cl.Close()
log.Debug().Str("container name", c.Name).Msg(
"found running container suitable for provisioning the namespace of the requested zdb",
)
cont = c
break
}
log.Debug().Str("container name", c.Name).Msg("zdb container is not reachable")
_ = cl.Close()
}
}

// if no reachable candidate was found, allocate a new device and start a container
if cont.Name == "" {
// allocate new disk
device, err := storage.DeviceAllocate(ctx, config.Size)
if err != nil {
Expand Down Expand Up @@ -869,6 +885,7 @@ func socketFile(containerID pkg.ContainerID) string {
// mock it in testing.
var zdbConnection = func(id pkg.ContainerID) zdb.Client {
socket := fmt.Sprintf("unix://%s@%s", string(id), socketFile(id))
log.Debug().Str("Socket", socket).Msg("connecting to zdb container on socket")
return zdb.New(socket)
}

Expand Down
Loading