Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
tracing: Fix tracing
Browse files Browse the repository at this point in the history 
The store refactor (#1066) inadvertently broke runtime tracing as it
created new contexts containing trace spans.

Reworking the store changes to re-use the existing context resolves the
problem since runtime tracing assumes a single context.

Fixes #1277.

Signed-off-by: James O. D. Hunt <[email protected]>
  • Loading branch information
@jodh-intel
jodh-intel committed Mar 4, 2019
1 parent 2af09d1 commit c759cf5
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 56 deletions.
92 changes: 46 additions & 46 deletions virtcontainers/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ func DeleteSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
return nil, errNeedSandboxID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down Expand Up @@ -168,11 +168,11 @@ func FetchSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
return nil, errNeedSandboxID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down Expand Up @@ -205,11 +205,11 @@ func StartSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
return nil, errNeedSandboxID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down Expand Up @@ -237,11 +237,11 @@ func StopSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
return nil, errNeedSandbox
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down Expand Up @@ -272,11 +272,11 @@ func RunSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
}
defer s.releaseStatelessSandbox()

lockFile, err := rwLockSandbox(s.id)
lockFile, err := rwLockSandbox(ctx, s.id)
if err != nil {
return nil, err
}
defer unlockSandbox(s.id, lockFile)
defer unlockSandbox(ctx, s.id, lockFile)

// Start the sandbox
err = s.Start()
Expand Down Expand Up @@ -331,15 +331,15 @@ func StatusSandbox(ctx context.Context, sandboxID string) (SandboxStatus, error)
return SandboxStatus{}, errNeedSandboxID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return SandboxStatus{}, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
unlockSandbox(sandboxID, lockFile)
unlockSandbox(ctx, sandboxID, lockFile)
return SandboxStatus{}, err
}
defer s.releaseStatelessSandbox()
Expand Down Expand Up @@ -377,11 +377,11 @@ func CreateContainer(ctx context.Context, sandboxID string, containerConfig Cont
return nil, nil, errNeedSandboxID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -412,11 +412,11 @@ func DeleteContainer(ctx context.Context, sandboxID, containerID string) (VCCont
return nil, errNeedContainerID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -441,11 +441,11 @@ func StartContainer(ctx context.Context, sandboxID, containerID string) (VCConta
return nil, errNeedContainerID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -470,11 +470,11 @@ func StopContainer(ctx context.Context, sandboxID, containerID string) (VCContai
return nil, errNeedContainerID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -499,11 +499,11 @@ func EnterContainer(ctx context.Context, sandboxID, containerID string, cmd type
return nil, nil, nil, errNeedContainerID
}

lockFile, err := rLockSandbox(sandboxID)
lockFile, err := rLockSandbox(ctx, sandboxID)
if err != nil {
return nil, nil, nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -533,15 +533,15 @@ func StatusContainer(ctx context.Context, sandboxID, containerID string) (Contai
return ContainerStatus{}, errNeedContainerID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return ContainerStatus{}, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
unlockSandbox(sandboxID, lockFile)
unlockSandbox(ctx, sandboxID, lockFile)
return ContainerStatus{}, err
}
defer s.releaseStatelessSandbox()
Expand Down Expand Up @@ -614,11 +614,11 @@ func KillContainer(ctx context.Context, sandboxID, containerID string, signal sy
return errNeedContainerID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -661,11 +661,11 @@ func ProcessListContainer(ctx context.Context, sandboxID, containerID string, op
return nil, errNeedContainerID
}

lockFile, err := rLockSandbox(sandboxID)
lockFile, err := rLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -690,11 +690,11 @@ func UpdateContainer(ctx context.Context, sandboxID, containerID string, resourc
return errNeedContainerID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -718,12 +718,12 @@ func StatsContainer(ctx context.Context, sandboxID, containerID string) (Contain
if containerID == "" {
return ContainerStats{}, errNeedContainerID
}
lockFile, err := rLockSandbox(sandboxID)
lockFile, err := rLockSandbox(ctx, sandboxID)
if err != nil {
return ContainerStats{}, err
}

defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -743,11 +743,11 @@ func togglePauseContainer(ctx context.Context, sandboxID, containerID string, pa
return errNeedContainerID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -787,11 +787,11 @@ func AddDevice(ctx context.Context, sandboxID string, info deviceConfig.DeviceIn
return nil, errNeedSandboxID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -807,11 +807,11 @@ func toggleInterface(ctx context.Context, sandboxID string, inf *vcTypes.Interfa
return nil, errNeedSandboxID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -851,11 +851,11 @@ func ListInterfaces(ctx context.Context, sandboxID string) ([]*vcTypes.Interface
return nil, errNeedSandboxID
}

lockFile, err := rLockSandbox(sandboxID)
lockFile, err := rLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -875,11 +875,11 @@ func UpdateRoutes(ctx context.Context, sandboxID string, routes []*vcTypes.Route
return nil, errNeedSandboxID
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -899,11 +899,11 @@ func ListRoutes(ctx context.Context, sandboxID string) ([]*vcTypes.Route, error)
return nil, errNeedSandboxID
}

lockFile, err := rLockSandbox(sandboxID)
lockFile, err := rLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down
20 changes: 10 additions & 10 deletions virtcontainers/sandbox.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,33 +567,33 @@ func (s *Sandbox) storeSandbox() error {
return nil
}

func rLockSandbox(sandboxID string) (string, error) {
store, err := store.NewVCSandboxStore(context.Background(), sandboxID)
func rLockSandbox(ctx context.Context, sandboxID string) (string, error) {
store, err := store.NewVCSandboxStore(ctx, sandboxID)
if err != nil {
return "", err
}

return store.RLock()
}

func rwLockSandbox(sandboxID string) (string, error) {
store, err := store.NewVCSandboxStore(context.Background(), sandboxID)
func rwLockSandbox(ctx context.Context, sandboxID string) (string, error) {
store, err := store.NewVCSandboxStore(ctx, sandboxID)
if err != nil {
return "", err
}

return store.Lock()
}

func unlockSandbox(sandboxID, token string) error {
func unlockSandbox(ctx context.Context, sandboxID, token string) error {
// If the store no longer exists, we won't be able to unlock.
// Creating a new store for locking an item that does not even exist
// does not make sense.
if !store.VCSandboxStoreExists(context.Background(), sandboxID) {
if !store.VCSandboxStoreExists(ctx, sandboxID) {
return nil
}

store, err := store.NewVCSandboxStore(context.Background(), sandboxID)
store, err := store.NewVCSandboxStore(ctx, sandboxID)
if err != nil {
return err
}
Expand All @@ -614,7 +614,7 @@ func fetchSandbox(ctx context.Context, sandboxID string) (sandbox *Sandbox, err
}

// We're bootstrapping
vcStore, err := store.NewVCSandboxStore(context.Background(), sandboxID)
vcStore, err := store.NewVCSandboxStore(ctx, sandboxID)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1457,11 +1457,11 @@ func togglePauseSandbox(ctx context.Context, sandboxID string, pause bool) (*San
return nil, errNeedSandbox
}

lockFile, err := rwLockSandbox(sandboxID)
lockFile, err := rwLockSandbox(ctx, sandboxID)
if err != nil {
return nil, err
}
defer unlockSandbox(sandboxID, lockFile)
defer unlockSandbox(ctx, sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down

0 comments on commit c759cf5

Please sign in to comment.