New external site management. New external prober heartbeat feature.

internal/db/queries_ipqueue.go

@@ -196,7 +196,7 @@ func (d *DB) RequeueOrFail(ctx context.Context, ipID int64, validatorID string,
 		_, err = tx.ExecContext(ctx, `
 			UPDATE ip_queue SET
 				state=?, owner_validator_id=NULL, fip_id='', retry_count=?, attempt_number=attempt_number+1,
-				lease_expires_at=NULL, egress_complete=0, site1_complete=0, site2_complete=0, site3_complete=0,
+				lease_expires_at=NULL, egress_complete=0,
 				overall_result='', assigned_at=NULL, fip_associated_at=NULL, updated_at=?
 			WHERE id=?
 		`, nextState, retryCount, now, ipID)
@@ -282,7 +282,7 @@ func (d *DB) SubmitIPs(ctx context.Context, addresses []string) (SubmitIPsResult
 				UPDATE ip_queue SET
 					state=?, sequence=?, owner_validator_id=NULL, fip_id='', retry_count=0,
 					attempt_number=attempt_number+1, lease_expires_at=NULL, egress_complete=0,
-					site1_complete=0, site2_complete=0, site3_complete=0, overall_result='',
+					overall_result='',
 					assigned_at=NULL, fip_associated_at=NULL, aggregated_at=NULL, fip_released_at=NULL, updated_at=?
 				WHERE ip_address=?
 			`, IPQueued, seq, now, addr); err != nil {
@@ -409,6 +409,9 @@ func deleteIPTx(ctx context.Context, tx *sql.Tx, ipID int64) error {
 	if _, err := tx.ExecContext(ctx, `DELETE FROM events WHERE ip_id=?`, ipID); err != nil {
 		return fmt.Errorf("delete events: %w", err)
 	}
+	if _, err := tx.ExecContext(ctx, `DELETE FROM ip_site_checks WHERE ip_id=?`, ipID); err != nil {
+		return fmt.Errorf("delete ip_site_checks: %w", err)
+	}
 	res, err := tx.ExecContext(ctx, `DELETE FROM ip_queue WHERE id=?`, ipID)
 	if err != nil {
 		return fmt.Errorf("delete ip_queue row: %w", err)
@@ -424,16 +427,6 @@ func (d *DB) SetEgressComplete(ctx context.Context, ipID int64) error {
 	return err
 }
 
-// SetSiteComplete marks completion for prober site 1, 2, or 3.
-func (d *DB) SetSiteComplete(ctx context.Context, ipID int64, siteIndex int) error {
-	col := map[int]string{1: "site1_complete", 2: "site2_complete", 3: "site3_complete"}[siteIndex]
-	if col == "" {
-		return fmt.Errorf("invalid site index %d", siteIndex)
-	}
-	_, err := d.ExecContext(ctx, fmt.Sprintf(`UPDATE ip_queue SET %s=1, updated_at=? WHERE id=?`, col), timeToDB(Now()), ipID)
-	return err
-}
-
 func (d *DB) GetIP(ctx context.Context, ipID int64) (*IPQueueItem, error) {
 	row := d.QueryRowContext(ctx, ipQueueSelect+`WHERE id=?`, ipID)
 	return scanIPQueueItem(row)
@@ -479,7 +472,7 @@ func (d *DB) ListExpiredLeases(ctx context.Context, now time.Time) ([]IPQueueIte
 
 const ipQueueSelect = `
 	SELECT id, ip_address, sequence, state, owner_validator_id, fip_id, attempt_number, retry_count,
-		lease_expires_at, egress_complete, site1_complete, site2_complete, site3_complete, overall_result,
+		lease_expires_at, egress_complete, overall_result,
 		assigned_at, fip_associated_at, aggregated_at, fip_released_at, created_at, updated_at
 	FROM ip_queue
 `
@@ -504,7 +497,7 @@ func scanIPQueueItem(row rowScanner) (*IPQueueItem, error) {
 	if err := row.Scan(
 		&item.ID, &item.IPAddress, &item.Sequence, &item.State, &owner, &item.FIPID,
 		&item.AttemptNumber, &item.RetryCount, &leaseExpires,
-		&item.EgressComplete, &item.Site1Complete, &item.Site2Complete, &item.Site3Complete,
+		&item.EgressComplete,
 		&item.OverallResult, &assignedAt, &fipAssociatedAt, &aggregatedAt, &fipReleasedAt, &createdAt, &updatedAt,
 	); err != nil {
 		return nil, err