Merge pull request #9606 from bhandras/skip-migration-rename

config: rename skip-sql-invoice-migration to skip-native-sql-migration
This commit is contained in:
András Bánki-Horváth 2025-03-18 13:56:45 +01:00 committed by GitHub
commit 3e8339cebc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 7 deletions

View File

@ -1099,7 +1099,7 @@ func (d *DefaultDatabaseBuilder) BuildDatabase(
// run. If the database version is already above this custom
// migration's version (7), it will be skipped permanently,
// regardless of the flag.
if !d.cfg.DB.SkipSQLInvoiceMigration {
if !d.cfg.DB.SkipNativeSQLMigration {
migrationFn := func(tx *sqlc.Queries) error {
err := invoices.MigrateInvoicesToSQL(
ctx, dbs.ChanStateDB.Backend,

View File

@ -368,6 +368,10 @@ The underlying functionality between those two options remain the same.
](https://github.com/lightningnetwork/lnd/pull/9438) tombstone after native
SQL migration.
* [Rename of skip migration
flag](https://github.com/lightningnetwork/lnd/pull/9606/) for future
compatibility.
## Code Health
* A code refactor that [moves all the graph related DB code out of the

View File

@ -87,7 +87,7 @@ type DB struct {
UseNativeSQL bool `long:"use-native-sql" description:"Use native SQL for tables that already support it."`
SkipSQLInvoiceMigration bool `long:"skip-sql-invoice-migration" description:"Do not migrate invoices stored in our key-value database to native SQL."`
SkipNativeSQLMigration bool `long:"skip-native-sql-migration" description:"Do not run the KV to native SQL migration. It should only be used if errors are encountered normally."`
NoGraphCache bool `long:"no-graph-cache" description:"Don't use the in-memory graph cache for path finding. Much slower but uses less RAM. Can only be used with a bolt database backend."`
@ -117,8 +117,8 @@ func DefaultDB() *DB {
MaxConnections: defaultSqliteMaxConnections,
BusyTimeout: defaultSqliteBusyTimeout,
},
UseNativeSQL: false,
SkipSQLInvoiceMigration: false,
UseNativeSQL: false,
SkipNativeSQLMigration: false,
}
}

View File

@ -1478,9 +1478,10 @@
; own risk.
; db.use-native-sql=false
; If set to true, native SQL invoice migration will be skipped. Note that this
; option is intended for users who experience non-resolvable migration errors.
; db.skip-sql-invoice-migration=false
; If set to true, the KV to native SQL migration will be skipped. Note that
; this option is intended for users who experience non-resolvable migration
; errors.
; db.skip-native-sql-migration=false
[etcd]