test(itests): remove HarmonyDB integration test

.github/workflows/test.yml

@@ -108,9 +108,6 @@ jobs:
               "multicore-sdr": ["self-hosted", "linux", "x64", "xlarge"],
               "unit-node": ["self-hosted", "linux", "x64", "xlarge"]
             }
-          # A list of test groups that require YugabyteDB to be running
-          yugabytedb: |
-            ["itest-harmonydb"]
           # A list of test groups that require Proof Parameters to be fetched
           parameters: |
             [
@@ -161,9 +158,6 @@ jobs:
           # Apply custom runner labels to the groups
           groups="$(jq -n --argjson g "$groups" --argjson r "$runners" '$g | map(. + {"runner": (.name as $n | $r | .[$n]) })')"
 
-          # Apply the needs_yugabytedb flag to the groups
-          groups="$(jq -n --argjson g "$groups" --argjson y "$yugabytedb" '$g | map(. + {"needs_yugabytedb": ([.name] | inside($y)) })')"
-
           # Apply the needs_parameters flag to the groups
           groups="$(jq -n --argjson g "$groups" --argjson p "$parameters" '$g | map(. + {"needs_parameters": ([.name] | inside($p)) })')"
 
@@ -262,17 +256,13 @@ jobs:
           key: ${{ needs.cache.outputs.fetch_params_key }}
           path: ${{ needs.cache.outputs.fetch_params_path }}
           fail-on-cache-miss: true
-      - if: ${{ matrix.needs_yugabytedb }}
-        uses: ./.github/actions/start-yugabytedb
-        timeout-minutes: 3
       # TODO: Install statediff (used to be used for conformance)
       - id: reports
         run: mktemp -d | xargs -0 -I{} echo "path={}" | tee -a $GITHUB_OUTPUT
       # TODO: Track coverage (used to be tracked for conformance)
       - env:
           NAME: ${{ matrix.name }}
           LOTUS_SRC_DIR: ${{ github.workspace }}
-          LOTUS_HARMONYDB_HOSTS: 127.0.0.1
           REPORTS_PATH: ${{ steps.reports.outputs.path }}
           SKIP_CONFORMANCE: ${{ matrix.skip_conformance || '1' }}
           TEST_RUSTPROOFS_LOGS: ${{ matrix.test_rustproofs_logs || '0' }}

itests/kit/ensemble.go

@@ -56,7 +56,6 @@ import (
 	lotusminer "github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node"
 	"github.com/filecoin-project/lotus/node/config"
-	"github.com/filecoin-project/lotus/node/impl"
 	"github.com/filecoin-project/lotus/node/modules"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	testing2 "github.com/filecoin-project/lotus/node/modules/testing"
@@ -789,12 +788,6 @@ func (n *Ensemble) Start() *Ensemble {
 		require.NoError(n.t, err)
 
 		n.t.Cleanup(func() { _ = stop(context.Background()) })
-		mCopy := m
-		n.t.Cleanup(func() {
-			if mCopy.BaseAPI.(*impl.StorageMinerAPI).HarmonyDB != nil {
-				mCopy.BaseAPI.(*impl.StorageMinerAPI).HarmonyDB.ITestDeleteAll()
-			}
-		})
 
 		m.BaseAPI = m.StorageMiner
 

lib/harmony/harmonydb/harmonydb.go

@@ -104,7 +104,6 @@ func New(hosts []string, username, password, database, port string, itestID ITes
 
 	cfg.ConnConfig.OnNotice = func(conn *pgconn.PgConn, n *pgconn.Notice) {
 		logger.Debug("database notice: " + n.Message + ": " + n.Detail)
-		DBMeasures.Errors.M(1)
 	}
 
 	db := DB{cfg: cfg, schema: schema, hostnames: hosts} // pgx populated in AddStatsAndConnect
@@ -115,32 +114,6 @@ func New(hosts []string, username, password, database, port string, itestID ITes
 	return &db, db.upgrade()
 }
 
-type tracer struct {
-}
-
-type ctxkey string
-
-const SQL_START = ctxkey("sqlStart")
-const SQL_STRING = ctxkey("sqlString")
-
-func (t tracer) TraceQueryStart(ctx context.Context, conn *pgx.Conn, data pgx.TraceQueryStartData) context.Context {
-	return context.WithValue(context.WithValue(ctx, SQL_START, time.Now()), SQL_STRING, data.SQL)
-}
-func (t tracer) TraceQueryEnd(ctx context.Context, conn *pgx.Conn, data pgx.TraceQueryEndData) {
-	DBMeasures.Hits.M(1)
-	ms := time.Since(ctx.Value(SQL_START).(time.Time)).Milliseconds()
-	DBMeasures.TotalWait.M(ms)
-	DBMeasures.Waits.Observe(float64(ms))
-	if data.Err != nil {
-		DBMeasures.Errors.M(1)
-	}
-	logger.Debugw("SQL run",
-		"query", ctx.Value(SQL_STRING).(string),
-		"err", data.Err,
-		"rowCt", data.CommandTag.RowsAffected(),
-		"milliseconds", ms)
-}
-
 func (db *DB) GetRoutableIP() (string, error) {
 	tx, err := db.pgx.Begin(context.Background())
 	if err != nil {
@@ -158,20 +131,10 @@ func (db *DB) GetRoutableIP() (string, error) {
 // addStatsAndConnect connects a prometheus logger. Be sure to run this before using the DB.
 func (db *DB) addStatsAndConnect() error {
 
-	db.cfg.ConnConfig.Tracer = tracer{}
-
 	hostnameToIndex := map[string]float64{}
 	for i, h := range db.hostnames {
 		hostnameToIndex[h] = float64(i)
 	}
-	db.cfg.AfterConnect = func(ctx context.Context, c *pgx.Conn) error {
-		s := db.pgx.Stat()
-		DBMeasures.OpenConnections.M(int64(s.TotalConns()))
-		DBMeasures.WhichHost.Observe(hostnameToIndex[c.Config().Host])
-
-		//FUTURE place for any connection seasoning
-		return nil
-	}
 
 	// Timeout the first connection so we know if the DB is down.
 	ctx, ctxClose := context.WithDeadline(context.Background(), time.Now().Add(5*time.Second))
@@ -185,21 +148,6 @@ func (db *DB) addStatsAndConnect() error {
 	return nil
 }
 
-// ITestDeleteAll will delete everything created for "this" integration test.
-// This must be called at the end of each integration test.
-func (db *DB) ITestDeleteAll() {
-	if !strings.HasPrefix(db.schema, "itest_") {
-		fmt.Println("Warning: this should never be called on anything but an itest schema.")
-		return
-	}
-	defer db.pgx.Close()
-	_, err := db.pgx.Exec(context.Background(), "DROP SCHEMA "+db.schema+" CASCADE")
-	if err != nil {
-		fmt.Println("warning: unclean itest shutdown: cannot delete schema: " + err.Error())
-		return
-	}
-}
-
 var schemaREString = "^[A-Za-z0-9_]+$"
 var schemaRE = regexp.MustCompile(schemaREString)