checkpoint

Author: bsamuels453

pkg/exploration/explore.go

@@ -23,7 +23,7 @@ import (
 )
 
 const WaitBetweenTestsSecs = 60
-const Seed = 557
+const Seed = 558
 
 func getRandomAttackSize() suite.AttackSize {
 	//return suite.AttackOne
@@ -78,10 +78,10 @@ func buildRandomLatencyTest(targetDescription string, targetSelectors []*suite.C
 }
 
 func buildRandomClockSkewTest(targetDescription string, targetSelectors []*suite.ChaosTargetSelector) (*types.SuiteTest, error) {
-	minDelaySeconds := -600
-	maxDelaySeconds := 600
+	minDelaySeconds := -900
+	maxDelaySeconds := 900
 	minDurationSeconds := 10
-	maxDurationSeconds := 300
+	maxDurationSeconds := 600
 
 	grace := time.Second * 300
 	delay := fmt.Sprintf("%ds", rand.Intn(maxDelaySeconds-minDelaySeconds)+minDelaySeconds)

pkg/kubernetes/port_forward.go

@@ -114,37 +114,31 @@ func (c *KubeClient) StartPortForwarding(pod string, localPort, remotePort int,
 	portForwardIssueCh := make(chan error, 1)
 	defer close(portForwardIssueCh)
 
-	retriesRem := 5
-	/*go func(retriesRem int) {
+	retries := 5
+	go func(retriesRem int, ready chan struct{}) {
 		for retriesRem > 0 {
 			if err = portForward.ForwardPorts(); err != nil {
 				retriesRem--
 				time.Sleep(200 * time.Millisecond)
 				if retriesRem == 0 {
 					portForwardIssueCh <- stacktrace.Propagate(err, "unable to start port forward session")
 				}
+			} else {
+				return
 			}
 		}
-	}(retries)*/
-
-	for retriesRem > 0 {
-		if err = portForward.ForwardPorts(); err != nil {
-			retriesRem--
-			time.Sleep(200 * time.Millisecond)
-		} else {
-			return stopCh, nil
-		}
-	}
-	//portForwardIssueCh <- stacktrace.Propagate(err, "unable to start port forward session")
-	return nil, errors.New("Failed to establish port forward")
+	}(retries, readyCh)
 
-	/*select {
+	//portForwardIssueCh <- stacktrace.Propagate(err, "unable to start port forward session")
+	//return nil, errors.New("Failed to establish port forward")
+	select {
 	case <-readyCh:
 		log.Debugf("Port-forward established to pod/%s:%d", pod, remotePort)
 	case <-time.After(time.Minute):
 		return nil, errors.New("timed out after waiting to establish port forward")
-	case err = <-portForwardIssueCh:
-		return nil, err
+		//case err = <-portForwardIssueCh:
+		//	return nil, err
+		//}
 	}
-	return stopCh, nil*/
+	return stopCh, nil
 }