Change SubjectDeleteMarkerTTL stream config field to duration

server/filestore.go

@@ -5356,7 +5356,7 @@ func (fs *fileStore) subjectDeleteMarkerIfNeeded(sm *StoreMsg, reason string) fu
 	// we'll default to 15 minutes — by that time every possible condition
 	// should have cleared (i.e. ordered consumer timeout, client timeouts,
 	// route/gateway interruptions, even device/client restarts etc).
-	ttl, _ := parseMessageTTL(fs.cfg.SubjectDeleteMarkerTTL)
+	ttl := int64(fs.cfg.SubjectDeleteMarkerTTL.Seconds())
 	if ttl <= 0 {
 		return nil
 	}

server/filestore_test.go

@@ -8570,7 +8570,7 @@ func TestFileStoreSubjectDeleteMarkers(t *testing.T) {
 		StreamConfig{
 			Name: "zzz", Subjects: []string{"test"}, Storage: FileStorage,
 			MaxAge: time.Second, AllowMsgTTL: true,
-			SubjectDeleteMarkers: true, SubjectDeleteMarkerTTL: "1s",
+			SubjectDeleteMarkers: true, SubjectDeleteMarkerTTL: time.Second,
 		},
 	)
 	require_NoError(t, err)
@@ -8614,7 +8614,7 @@ func TestFileStoreSubjectDeleteMarkersOnRestart(t *testing.T) {
 		StreamConfig{
 			Name: "zzz", Subjects: []string{"test"}, Storage: FileStorage,
 			MaxAge: time.Second, AllowMsgTTL: true,
-			SubjectDeleteMarkers: true, SubjectDeleteMarkerTTL: "1s",
+			SubjectDeleteMarkers: true, SubjectDeleteMarkerTTL: time.Second,
 		},
 	)
 	require_NoError(t, err)
@@ -8637,7 +8637,7 @@ func TestFileStoreSubjectDeleteMarkersOnRestart(t *testing.T) {
 		StreamConfig{
 			Name: "zzz", Subjects: []string{"test"}, Storage: FileStorage,
 			MaxAge: time.Second, AllowMsgTTL: true,
-			SubjectDeleteMarkers: true, SubjectDeleteMarkerTTL: "1s",
+			SubjectDeleteMarkers: true, SubjectDeleteMarkerTTL: time.Second,
 		},
 	)
 	require_NoError(t, err)

server/jetstream_test.go

@@ -24171,7 +24171,7 @@ func TestJetStreamStreamCreatePedanticMode(t *testing.T) {
 					Storage:                FileStorage,
 					AllowMsgTTL:            true,
 					SubjectDeleteMarkers:   true,
-					SubjectDeleteMarkerTTL: "10m",
+					SubjectDeleteMarkerTTL: 10 * time.Minute,
 				},
 				Pedantic: true,
 			},
@@ -24218,7 +24218,7 @@ func TestJetStreamStreamCreatePedanticMode(t *testing.T) {
 					Storage:                FileStorage,
 					AllowMsgTTL:            true,
 					SubjectDeleteMarkers:   true,
-					SubjectDeleteMarkerTTL: "11m",
+					SubjectDeleteMarkerTTL: 11 * time.Minute,
 				},
 				Pedantic: true,
 			},
@@ -25369,7 +25369,7 @@ func TestJetStreamSubjectDeleteMarkers(t *testing.T) {
 				MaxAge:                 time.Second,
 				AllowMsgTTL:            true,
 				SubjectDeleteMarkers:   true,
-				SubjectDeleteMarkerTTL: "1s",
+				SubjectDeleteMarkerTTL: time.Second,
 			})
 
 			sub, err := js.SubscribeSync("test")

server/memstore.go

@@ -990,7 +990,7 @@ func (ms *memStore) subjectDeleteMarkerIfNeeded(sm *StoreMsg, reason string) fun
 	// we'll default to 15 minutes — by that time every possible condition
 	// should have cleared (i.e. ordered consumer timeout, client timeouts,
 	// route/gateway interruptions, even device/client restarts etc).
-	ttl, _ := parseMessageTTL(ms.cfg.SubjectDeleteMarkerTTL)
+	ttl := int64(ms.cfg.SubjectDeleteMarkerTTL.Seconds())
 	if ttl <= 0 {
 		return nil
 	}

server/memstore_test.go

@@ -1194,7 +1194,7 @@ func TestMemStoreSubjectDeleteMarkers(t *testing.T) {
 		&StreamConfig{
 			Name: "zzz", Subjects: []string{"test"}, Storage: MemoryStorage,
 			MaxAge: time.Second, AllowMsgTTL: true,
-			SubjectDeleteMarkers: true, SubjectDeleteMarkerTTL: "1s",
+			SubjectDeleteMarkers: true, SubjectDeleteMarkerTTL: time.Second,
 		},
 	)
 	require_NoError(t, err)

server/store.go

@@ -71,7 +71,7 @@ var (
 )
 
 // Default value for SubjectDeleteMarkerTTL if not specified.
-const subjectDeleteMarkerDefaultTTL = "15m"
+const subjectDeleteMarkerDefaultTTL = 15 * time.Minute
 
 // StoreMsg is the stored message format for messages that are retained by the Store layer.
 type StoreMsg struct {

server/stream.go

@@ -110,7 +110,7 @@ type StreamConfig struct {
 
 	// SubjectDeleteMarkerTTL sets the TTL of delete marker messages left behind by
 	// SubjectDeleteMarkers.
-	SubjectDeleteMarkerTTL string `json:"subject_delete_marker_ttl,omitempty"`
+	SubjectDeleteMarkerTTL time.Duration `json:"subject_delete_marker_ttl,omitempty"`
 
 	// Metadata is additional metadata for the Stream.
 	Metadata map[string]string `json:"metadata,omitempty"`
@@ -1370,22 +1370,18 @@ func (s *Server) checkStreamCfg(config *StreamConfig, acc *Account, pedantic boo
 		if !cfg.AllowMsgTTL {
 			return StreamConfig{}, NewJSStreamInvalidConfigError(fmt.Errorf("subject marker delete cannot be set if message TTLs are disabled"))
 		}
-		if pedantic && cfg.SubjectDeleteMarkerTTL == _EMPTY_ {
+		if pedantic && cfg.SubjectDeleteMarkerTTL == 0 {
 			return StreamConfig{}, NewJSPedanticError(fmt.Errorf("pedantic mode: subject marker delete TTL can not be empty"))
 		}
-		if cfg.SubjectDeleteMarkerTTL != _EMPTY_ {
-			ttl, err := parseMessageTTL(cfg.SubjectDeleteMarkerTTL)
-			if err != nil {
-				return StreamConfig{}, NewJSStreamInvalidConfigError(fmt.Errorf("invalid subject marker delete TTL: %s", err.Error()))
-			}
-			if ttl < 1 {
+		if cfg.SubjectDeleteMarkerTTL != 0 {
+			if cfg.SubjectDeleteMarkerTTL < time.Second {
 				return StreamConfig{}, NewJSStreamInvalidConfigError(fmt.Errorf("subject marker delete TTL must be at least 1 second"))
 			}
 		} else {
 			cfg.SubjectDeleteMarkerTTL = subjectDeleteMarkerDefaultTTL
 		}
 	} else {
-		if cfg.SubjectDeleteMarkerTTL != _EMPTY_ {
+		if cfg.SubjectDeleteMarkerTTL != 0 {
 			return StreamConfig{}, NewJSStreamInvalidConfigError(fmt.Errorf("subject marker delete TTL requires subject delete markers to be enabled"))
 		}
 	}