bug(ldfi2): LDFI v2 should only use non-dropped messages in traces

platonic-io · Feb 18, 2021 · 670dcfb · 670dcfb
1 parent 1d4e7ca
commit 670dcfb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/ldfi2/src/Ldfi/Storage.hs b/src/ldfi2/src/Ldfi/Storage.hs
@@ -67,6 +67,7 @@ sqliteLoad testId = do
     "SELECT run_id,sender,receiver,recv_logical_time,sent_logical_time FROM network_trace \
     \ WHERE test_id = :testId \
     \ AND kind <> 'timer' \
+    \ AND NOT dropped \
     \ AND NOT (sender   LIKE 'client:%') \
     \ AND NOT (receiver LIKE 'client:%') \
     \ ORDER BY run_id ASC"

diff --git a/src/lib/ldfi.go b/src/lib/ldfi.go
@@ -74,13 +74,10 @@ func (f *Fault) UnmarshalJSON(bs []byte) error {
 func Ldfi(testId TestId, runIds []RunId, fail FailSpec) Faults {
 	start := time.Now()
 	args := []string{
-		"--eff", strconv.Itoa(fail.EFF),
-		"--crashes", strconv.Itoa(fail.Crashes),
-		"--test-id", strconv.Itoa(testId.TestId),
-		"--run-ids",
-	}
-	for _, runId := range runIds {
-		args = append(args, strconv.Itoa(runId.RunId))
+		"--endOfFiniteFailures", strconv.Itoa(fail.EFF),
+		"--maxCrashes", strconv.Itoa(fail.Crashes),
+		"--testId", strconv.Itoa(testId.TestId),
+		"--endOfTime", strconv.Itoa(0), // not used
 	}
 	cmd := exec.Command("detsys-ldfi", args...)
 	cmd.Stderr = os.Stderr