fix(executor): PNS support artifacts for short-running containers (#5427

)
argoproj · Mar 18, 2021 · 2371a6d · 2371a6d
1 parent 07ef0e6
commit 2371a6d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/test/e2e/artifacts_test.go b/test/e2e/artifacts_test.go
@@ -45,7 +45,6 @@ func (s *ArtifactsSuite) TestOutputOnInput() {
 
 func (s *ArtifactsSuite) TestArtifactPassing() {
 	s.Need(fixtures.BaseLayerArtifacts)
-	s.Need(fixtures.None(fixtures.PNS))
 	s.Given().
 		Workflow("@smoke/artifact-passing.yaml").
 		When().
@@ -55,7 +54,6 @@ func (s *ArtifactsSuite) TestArtifactPassing() {
 
 func (s *ArtifactsSuite) TestDefaultParameterOutputs() {
 	s.Need(fixtures.BaseLayerArtifacts)
-	s.Need(fixtures.None(fixtures.PNS))
 	s.Given().
 		Workflow(`
 apiVersion: argoproj.io/v1alpha1
@@ -109,7 +107,6 @@ spec:
 
 func (s *ArtifactsSuite) TestSameInputOutputPathOptionalArtifact() {
 	s.Need(fixtures.BaseLayerArtifacts)
-	s.Need(fixtures.None(fixtures.PNS))
 	s.Given().
 		Workflow("@testdata/same-input-output-path-optional.yaml").
 		When().
@@ -119,7 +116,6 @@ func (s *ArtifactsSuite) TestSameInputOutputPathOptionalArtifact() {
 
 func (s *ArtifactsSuite) TestOutputArtifactS3BucketCreationEnabled() {
 	s.Need(fixtures.BaseLayerArtifacts)
-	s.Need(fixtures.None(fixtures.PNS))
 	s.Given().
 		Workflow("@testdata/output-artifact-with-s3-bucket-creation-enabled.yaml").
 		When().

diff --git a/workflow/executor/pns/pns.go b/workflow/executor/pns/pns.go
@@ -23,6 +23,8 @@ import (
 	osspecific "github.com/argoproj/argo-workflows/v3/workflow/executor/os-specific"
 )
 
+const anonymousPIDPrefix = "pid/"
+
 type PNSExecutor struct {
 	*k8sapi.K8sAPIExecutor
 	podName   string
@@ -284,7 +286,17 @@ func (p *PNSExecutor) killContainer(containerName string, terminationGracePeriod
 func (p *PNSExecutor) getContainerPID(containerName string) int {
 	p.mu.RLock()
 	defer p.mu.RUnlock()
-	return p.containerNameToPID[containerName]
+	if pid, ok := p.containerNameToPID[containerName]; ok {
+		return pid
+	}
+	for n, pid := range p.containerNameToPID {
+		// the container can't be me, and it must be anonymous, otherwise we would have determined it
+		if pid != os.Getpid() && strings.HasPrefix(n, anonymousPIDPrefix) {
+			log.Infof("guessing container %q PID is %d", containerName, pid)
+			return pid
+		}
+	}
+	return 0
 }
 
 func containerNameForPID(pid int) (string, error) {
@@ -298,7 +310,7 @@ func containerNameForPID(pid int) (string, error) {
 			return strings.TrimPrefix(l, prefix), nil
 		}
 	}
-	return fmt.Sprintf("pid/%d", pid), nil // we give all a "container name", including a fake name for injected sidecars
+	return fmt.Sprintf("%s%d", anonymousPIDPrefix, pid), nil // we give all a "container name", including a fake name for injected sidecars
 }
 
 func (p *PNSExecutor) secureRootFiles() error {