Merge PR #4471: Migrate genesis cmd

contrib/runsim/main.go

@@ -52,7 +52,7 @@ var (
 	genesis      string
 	exitOnFail   bool
 	githubConfig string
-	gitRevision  string
+	logObjKey    string
 	slackConfig  string
 
 	// integration with Slack and Github
@@ -82,7 +82,7 @@ func init() {
 	flag.StringVar(&genesis, "g", "", "Genesis file")
 	flag.StringVar(&seedOverrideList, "seeds", "", "run the supplied comma-separated list of seeds instead of defaults")
 	flag.BoolVar(&exitOnFail, "e", false, "Exit on fail during multi-sim, print error")
-	flag.StringVar(&gitRevision, "rev", "", "git revision")
+	flag.StringVar(&logObjKey, "log", "", "S3 object key for log files")
 	flag.StringVar(&githubConfig, "github", "", "Report results to Github's PR")
 	flag.StringVar(&slackConfig, "slack", "", "Report results to slack channel")
 
@@ -224,7 +224,17 @@ func makeCmd(cmdStr string) *exec.Cmd {
 }
 
 func makeFilename(seed int) string {
-	return fmt.Sprintf("app-simulation-seed-%d-date-%s", seed, time.Now().Format("01-02-2006_15:04:05.000000000"))
+	return fmt.Sprintf("app-simulation-seed-%d-date-%s", seed, time.Now().Format("01-02-2006_150405"))
+}
+
+func makeFailSlackMsg(seed int, stdoutKey, stderrKey, bucket string, logsPushed bool) string {
+	if logsPushed {
+		return fmt.Sprintf("*Seed %s: FAILED*. *<https://%s.s3.amazonaws.com/%s|stdout>* *<https://%s.s3.amazonaws.com/%s|stderr>*\nTo reproduce run: ```\n%s\n```",
+			strconv.Itoa(seed), bucket, stdoutKey, bucket, stderrKey, buildCommand(testname, blocks, period, genesis, seed))
+	} else {
+		return fmt.Sprintf("*Seed %s: FAILED*. Could not upload logs: %s\nTo reproduce run: ```\n%s\n```",
+			strconv.Itoa(seed), bucket, buildCommand(testname, blocks, period, genesis, seed))
+	}
 }
 
 func worker(id int, seeds <-chan int) {
@@ -236,18 +246,22 @@ func worker(id int, seeds <-chan int) {
 			log.Printf("[W%d] Seed %d: FAILED", id, seed)
 			log.Printf("To reproduce run: %s", buildCommand(testname, blocks, period, genesis, seed))
 			if slackConfigSupplied() {
-				slackMessage(slackToken, slackChannel, nil, "Seed "+strconv.Itoa(seed)+" failed. To reproduce, run: "+buildCommand(testname, blocks, period, genesis, seed))
+				objKeys, bucket, awsErr := pushLogs(stdOut, stdErr, logObjKey)
+				if awsErr != nil {
+					slackMessage(slackToken, slackChannel, nil, makeFailSlackMsg(seed, "", "", awsErr.Error(), false))
+				} else {
+					slackMessage(slackToken, slackChannel, nil, makeFailSlackMsg(seed, objKeys[0], objKeys[1], *bucket, true))
+				}
 			}
 			if exitOnFail {
 				log.Printf("\bERROR OUTPUT \n\n%s", err)
 				panic("halting simulations")
 			}
 		} else {
 			log.Printf("[W%d] Seed %d: OK", id, seed)
+			_, _, _ = pushLogs(stdOut, stdErr, logObjKey)
 		}
-		pushLogs(stdOut, stdErr, gitRevision)
 	}
-
 	log.Printf("[W%d] no seeds left, shutting down", id)
 }
 

contrib/runsim/notification.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
@@ -20,61 +19,64 @@ const (
 	awsRegion       = "us-east-1"
 )
 
-var (
-	simTimeStamp = time.Now().Format("01-02-2006_15:05:05")
-)
-
-func awsErrHandler(err error) {
+func awsErrHandler(err error) error {
 	if awsErr, ok := err.(awserr.Error); ok {
 		switch awsErr.Code() {
 		default:
-			log.Println(awsErr.Error())
+			return awsErr
 		}
 	} else {
-		log.Println(err.Error())
+		return err
 	}
 }
 
-func makeObjKey(folderName string, fileName string) string {
-	return fmt.Sprintf("%s/%s/%s", folderName, simTimeStamp, fileName)
+func makeObjKey(objKeyPrefix string, fileName string) string {
+	return fmt.Sprintf("%s/%s", objKeyPrefix, fileName)
 }
 
-func putObj(fileHandle *os.File, svc *s3.S3, folderName string, bucketName string) {
-	_, _ = fileHandle.Seek(0, 0)
-
-	stdOutObjInput := &s3.PutObjectInput{
-		Body:   aws.ReadSeekCloser(fileHandle),
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(makeObjKey(folderName, filepath.Base(fileHandle.Name()))),
-	}
-	if output, err := svc.PutObject(stdOutObjInput); err != nil {
-		awsErrHandler(err)
-	} else {
-		log.Printf("Log file pushed: %s", output.String())
+func putObjects(svc *s3.S3, objKeyPrefix string, bucketName string, fileHandles ...*os.File) ([]string, error) {
+	objKeys := make([]string, len(fileHandles))
+	for index, fileHandle := range fileHandles {
+		_, _ = fileHandle.Seek(0, 0)
+		objKey := makeObjKey(objKeyPrefix, filepath.Base(fileHandle.Name()))
+		stdOutObjInput := &s3.PutObjectInput{
+			Body:   aws.ReadSeekCloser(fileHandle),
+			Bucket: aws.String(bucketName),
+			Key:    aws.String(objKey),
+		}
+		_, err := svc.PutObject(stdOutObjInput)
+		if err != nil {
+			return nil, awsErrHandler(err)
+		}
+		objKeys[index] = objKey
 	}
+	return objKeys, nil
 }
 
-func pushLogs(stdOut *os.File, stdErr *os.File, folderName string) {
+func pushLogs(stdOut *os.File, stdErr *os.File, folderName string) ([]string, *string, error) {
 	var logBucket *string
 
 	sessionS3 := s3.New(session.Must(session.NewSession(&aws.Config{
 		Region: aws.String(awsRegion),
 	})))
 	if listBucketsOutput, err := sessionS3.ListBuckets(&s3.ListBucketsInput{}); err != nil {
-		awsErrHandler(err)
+		awsErr := awsErrHandler(err)
+		if awsErr != nil {
+			return nil, nil, awsErr
+		}
 	} else {
 		for _, bucket := range listBucketsOutput.Buckets {
 			if strings.Contains(*bucket.Name, logBucketPrefix) {
 				logBucket = bucket.Name
-				putObj(stdOut, sessionS3, folderName, *logBucket)
-				putObj(stdErr, sessionS3, folderName, *logBucket)
-				break
+				objKeys, putObjErr := putObjects(sessionS3, folderName, *logBucket, stdOut, stdErr)
+				if putObjErr != nil {
+					return nil, nil, putObjErr
+				}
+				return objKeys, bucket.Name, nil
 			}
 		}
 	}
-	if logBucket == nil {
-		log.Println("Log bucket not found")
-	}
+	return nil, nil, nil
 }
 
 func slackMessage(token string, channel string, threadTS *string, message string) {