rework oplog duration calc

tidepool-org · Dec 11, 2023 · 21b40f8 · 21b40f8
1 parent 9ddac0f
commit 21b40f8
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/migrations/20231128_jellyfish_migration/20231128_jellyfish_migration.go b/migrations/20231128_jellyfish_migration/20231128_jellyfish_migration.go
@@ -217,24 +217,31 @@ func (m *Migration) execute() error {
 
 func (m *Migration) getOplogDuration() (time.Duration, error) {
 	type MongoMetaData struct {
-		Wall time.Time `json:"wall"`
+		Wall int64 `json:"wall"`
 	}
+	log.Println("checking oplog duration ")
 	if oplogC := m.getOplogCollection(); oplogC != nil {
 		var oldest MongoMetaData
+
 		if err := oplogC.FindOne(
-			m.ctx, bson.M{},
-			options.FindOne().SetSort("$natural"),
-			options.FindOne().SetProjection(bson.M{"wall": 1})).Decode(&oldest); err != nil {
+			m.ctx,
+			bson.M{"wall": bson.M{"$exists": true}},
+			options.FindOne().SetSort("$natural")).Decode(&oldest); err != nil {
 			return 0, err
 		}
+
+		log.Printf("oldest %v ", oldest)
 		var newest MongoMetaData
-		if err := oplogC.FindOne(m.ctx,
-			bson.M{},
-			options.FindOne().SetSort("-$natural"),
-			options.FindOne().SetProjection(bson.M{"wall": 1})).Decode(&newest); err != nil {
+		if err := oplogC.FindOne(
+			m.ctx,
+			bson.M{"wall": bson.M{"$exists": true}},
+			options.FindOne().SetSort("-$natural")).Decode(&newest); err != nil {
 			return 0, err
 		}
-		oplogDuration := oldest.Wall.Sub(oldest.Wall)
+		log.Printf("newest %v ", newest)
+		oldestT := time.UnixMilli(oldest.Wall)
+		newestT := time.UnixMilli(newest.Wall)
+		oplogDuration := newestT.Sub(oldestT)
 		log.Printf("oplog duration is currently: %v\n", oplogDuration)
 		return oplogDuration, nil
 	}