Cleanup

Author: davissp14

cmd/event_handler/main.go

@@ -73,7 +73,6 @@ func main() {
 func evaluateClusterState(ctx context.Context, conn *pgx.Conn, node *flypg.Node) error {
 	primary, err := node.EvaluateClusterState(ctx, conn)
 	if errors.Is(err, flypg.ErrZombieDiagnosisUndecided) || errors.Is(err, flypg.ErrZombieDiscovered) {
-		// Quarantine primary
 		if err := flypg.Quarantine(ctx, conn, node, primary); err != nil {
 			return fmt.Errorf("failed to quarantine failed primary: %s", err)
 		}
@@ -84,14 +83,14 @@ func evaluateClusterState(ctx context.Context, conn *pgx.Conn, node *flypg.Node)
 
 	// Clear zombie lock if it exists
 	if flypg.ZombieLockExists() {
-		log.Println("Clearing zombie lock and enabling read/write")
+		log.Println("Clearing zombie lock and re-enabling read/write")
 		if err := flypg.RemoveZombieLock(); err != nil {
 			return fmt.Errorf("failed to remove zombie lock: %s", err)
 		}
 
 		log.Println("Broadcasting readonly state change")
 		if err := flypg.BroadcastReadonlyChange(ctx, node, false); err != nil {
-			log.Printf("errors while disabling readonly: %s", err)
+			log.Printf("failed to disable readonly: %s", err)
 		}
 	}
 

internal/flypg/zombie.go

@@ -157,7 +157,6 @@ func ZombieDiagnosis(s *DNASample) (string, error) {
 }
 
 func Quarantine(ctx context.Context, conn *pgx.Conn, n *Node, primary string) error {
-	fmt.Println("Writing zombie.lock file.")
 	if err := writeZombieLock(primary); err != nil {
 		return fmt.Errorf("failed to set zombie lock: %s", err)
 	}