@@ -14,31 +14,33 @@ See the License for the specific language governing permissions and
1414limitations under the License.
1515*/
1616
17- package binremote
17+ package remote
1818
1919import (
2020 "fmt"
2121 "path"
2222 "path/filepath"
23+ "strconv"
24+ "strings"
2325
2426 "github.com/golang/glog"
2527)
2628
27- func (i * InstanceInfo ) UploadAndRun (archivePath , remoteWorkspace , driverRunCmd string ) error {
29+ func (i * InstanceInfo ) UploadAndRun (archivePath , remoteWorkspace , driverRunCmd string ) ( int , error ) {
2830
2931 // Create the temp staging directory
3032 glog .V (4 ).Infof ("Staging test binaries on %q" , i .name )
3133
3234 // Do not sudo here, so that we can use scp to copy test archive to the directdory.
3335 if output , err := i .SSHNoSudo ("mkdir" , remoteWorkspace ); err != nil {
3436 // Exit failure with the error
35- return fmt .Errorf ("failed to create remoteWorkspace directory %q on i.name %q: %v output: %q" , remoteWorkspace , i .name , err , output )
37+ return - 1 , fmt .Errorf ("failed to create remoteWorkspace directory %q on i.name %q: %v output: %q" , remoteWorkspace , i .name , err , output )
3638 }
3739
3840 // Copy the archive to the staging directory
3941 if output , err := runSSHCommand ("scp" , archivePath , fmt .Sprintf ("%s:%s/" , i .GetSSHTarget (), remoteWorkspace )); err != nil {
4042 // Exit failure with the error
41- return fmt .Errorf ("failed to copy test archive: %v, output: %q" , err , output )
43+ return - 1 , fmt .Errorf ("failed to copy test archive: %v, output: %q" , err , output )
4244 }
4345
4446 // Extract the archive
@@ -52,22 +54,40 @@ func (i *InstanceInfo) UploadAndRun(archivePath, remoteWorkspace, driverRunCmd s
5254 // we want the extracted files to be owned by the current user.
5355 if output , err := i .SSHNoSudo ("sh" , "-c" , cmd ); err != nil {
5456 // Exit failure with the error
55- return fmt .Errorf ("failed to extract test archive: %v, output: %q" , err , output )
57+ return - 1 , fmt .Errorf ("failed to extract test archive: %v, output: %q" , err , output )
5658 }
5759
5860 glog .V (4 ).Infof ("Starting driver on %q" , i .name )
5961 // When the process is killed the driver should close the TCP endpoint, then we want to download the logs
6062 output , err := i .SSH (driverRunCmd )
63+ if err != nil {
64+ // Exit failure with the error
65+ return - 1 , fmt .Errorf ("failed start driver, got output: %v, error: %v" , output , err )
66+ }
6167
68+ // Get the driver PID
69+ // ps -aux | grep /tmp/gce-pd-e2e-0180801T114407/gce-pd-csi-driver | awk '{print $2}'
70+ driverPIDCmd := getSSHCommand (" | " ,
71+ "ps -aux" ,
72+ fmt .Sprintf ("grep %s" , remoteWorkspace ),
73+ "grep -v grep" ,
74+ // All ye who try to deal with escaped/non-escaped quotes with exec beware.
75+ //`awk "{print \$2}"`,
76+ )
77+ driverPIDString , err := i .SSHNoSudo ("sh" , "-c" , driverPIDCmd )
6278 if err != nil {
6379 // Exit failure with the error
64- return fmt .Errorf ("failed start GCE PD driver, got output: %v, error: %v" , output , err )
80+ return - 1 , fmt .Errorf ("failed to get PID of driver, got output: %v, error: %v" , output , err )
6581 }
6682
83+ driverPID , err := strconv .Atoi (strings .Fields (driverPIDString )[1 ])
84+ if err != nil {
85+ return - 1 , fmt .Errorf ("failed to convert driver PID from string %s to int: %v" , driverPIDString , err )
86+ }
6787 // TODO: return the PID so that we can kill the driver later
6888 // Actually just do a pkill -f my_pattern
6989
70- return nil
90+ return driverPID , nil
7191}
7292
7393func NewWorkspaceDir (workspaceDirPrefix string ) string {
0 commit comments