merge pendingAdoptions/conflicts

Signed-off-by: Tilak Raj <tilak.raj94@gmail.com>

Author: tilakraj94

server/jetstream_cluster.go

@@ -1545,16 +1545,12 @@ func (js *jetStream) checkForOrphans() {
 			}
 			if b, err := json.Marshal(cfgCopy); err != nil {
 				s.Warnf("Failed to marshal config for stream adoption '%s > %s': %v", accName, cfg.Name, err)
-				conflicts = true
-				continue
 			} else {
 				sa.ConfigJSON = b
-			}
-			s.Noticef("Adopting orphaned R1 stream '%s > %s' into cluster assignments", accName, cfg.Name)
-			if err := meta.ForwardProposal(encodeAddStreamAssignment(sa)); err != nil {
-				s.Warnf("Failed to propose adoption of R1 stream '%s > %s': %v", accName, cfg.Name, err)
-				conflicts = true
-				continue
+				s.Noticef("Adopting orphaned R1 stream '%s > %s' into cluster assignments", accName, cfg.Name)
+				if err := meta.ForwardProposal(encodeAddStreamAssignment(sa)); err != nil {
+					s.Warnf("Failed to propose adoption of R1 stream '%s > %s': %v", accName, cfg.Name, err)
+				}
 			}
 
 			// Consumer adoption is deferred to the next sweep: once the stream
@@ -1563,7 +1559,6 @@ func (js *jetStream) checkForOrphans() {
 			// loop below will adopt them. This avoids a race where a consumer
 			// proposal could be applied before the stream proposal during a leader
 			// transition.
-			conflicts = true
 			pendingAdoptions = true
 			continue
 		}
@@ -1611,18 +1606,15 @@ func (js *jetStream) checkForOrphans() {
 			}
 			if b, err := json.Marshal(oCfg); err != nil {
 				s.Warnf("Failed to marshal config for consumer adoption '%s > %s > %s': %v", accName, streamName, oName, err)
-				conflicts = true
-				continue
 			} else {
 				ca.ConfigJSON = b
-			}
-			s.Noticef("Adopting orphaned consumer '%s > %s > %s' into cluster assignments", accName, streamName, oName)
-			if err := meta.ForwardProposal(encodeAddConsumerAssignment(ca)); err != nil {
-				s.Warnf("Failed to propose adoption of consumer '%s > %s > %s': %v", accName, streamName, oName, err)
+				s.Noticef("Adopting orphaned consumer '%s > %s > %s' into cluster assignments", accName, streamName, oName)
+				if err := meta.ForwardProposal(encodeAddConsumerAssignment(ca)); err != nil {
+					s.Warnf("Failed to propose adoption of consumer '%s > %s > %s': %v", accName, streamName, oName, err)
+				}
 			}
 			// Proposal is async; keep the marker until the next sweep confirms the
 			// consumer is no longer an orphan after the Raft entry is committed.
-			conflicts = true
 			pendingAdoptions = true
 			continue
 		}
@@ -1645,7 +1637,7 @@ func (js *jetStream) checkForOrphans() {
 		return
 	}
 
-	if conflicts {
+	if conflicts || pendingAdoptions {
 		err := js.writePTCMarker()
 		if err != nil {
 			s.Warnf("Failed to write ptc marker: %v", err)