pod: Run post-start hooks outside netns

James O. D. Hunt · James O. D. Hunt · commit c3663b2fcad5 · 2017-11-14T09:12:17.000Z
Synchronise RunPod() with StartPod() by making the post-start hooks run outside of the network namespace. This looks like an oversight from ab994f0. Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
diff --git a/api.go b/api.go
@@ -276,11 +276,8 @@ func RunPod(podConfig PodConfig) (VCPod, error) {
 		return nil, err
 	}
 
-	// Execute poststart hooks inside netns
-	err = p.network.run(networkNS.NetNsPath, func() error {
-		return p.config.Hooks.postStartHooks()
-	})
-	if err != nil {
+	// Execute poststart hooks
+	if err := p.config.Hooks.postStartHooks(); err != nil {
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -276,11 +276,8 @@ func RunPod(podConfig PodConfig) (VCPod, error) {`
`276`	`276`	`return nil, err`
`277`	`277`	`}`
`278`	`278`
`279`		`- // Execute poststart hooks inside netns`
`280`		`- err = p.network.run(networkNS.NetNsPath, func() error {`
`281`		`- return p.config.Hooks.postStartHooks()`
`282`		`- })`
`283`		`- if err != nil {`
	`279`	`+ // Execute poststart hooks`
	`280`	`+ if err := p.config.Hooks.postStartHooks(); err != nil {`
`284`	`281`	`return nil, err`
`285`	`282`	`}`
`286`	`283`