Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

invoices: migrate KV invoices to native SQL for users of KV SQL backends #8831

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

bhandras
Copy link
Collaborator

@bhandras bhandras commented Jun 12, 2024

Change Description

This pull request adds the migration of old key-value (KV) invoices to the new native SQL schema when the --db.use-native-sql flag is set, unless the --db.skip-sql-invoice-migration flag is also specified.

Please note that since we currently do not support running on mixed database backends for users of bbolt or etcd, an additional step is required to migrate their KV database to SQL first. For more context, please see lightninglabs/lndinit#21.

Copy link
Contributor

coderabbitai bot commented Jun 12, 2024

Important

Review skipped

Auto reviews are limited to specific labels.

🏷️ Labels to auto review (1)
  • llm-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@bhandras bhandras self-assigned this Jun 12, 2024
@bhandras bhandras added database Related to the database/storage of LND migration labels Jun 12, 2024
@bhandras bhandras added this to the 0.19.0 milestone Jun 12, 2024
@bhandras bhandras force-pushed the sql-invoice-migration branch 3 times, most recently from 6682b50 to 338e1f0 Compare June 12, 2024 15:30
@bhandras bhandras force-pushed the sql-invoice-migration branch 3 times, most recently from d2a329f to 6379a8b Compare June 21, 2024 17:37
@bhandras bhandras force-pushed the sql-invoice-migration branch 2 times, most recently from 5fe92e2 to a7bf598 Compare August 14, 2024 09:38
var paymentHash lntypes.Hash
if invoice.Terms.PaymentPreimage != nil {
paymentHash = invoice.Terms.PaymentPreimage.Hash()
} else {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't correctly handle the case of an invoice generated by receiving a spontaneous AMP payment, which should have an empty payment hash IIUC. To test this, run the migration on Bob's DB resulting from the itest sendpayment_amp_invoice/external_payaddr.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch, thank you for pointing this out! Fix is coming soon as well as the rest of the missing parts. Migrating spontaneous AMP invoices required building an index at migration time so we're able to map add indexes to payment hashes.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like spontaneous amp payments still have a valid payment hash tho or ?

@bhandras bhandras force-pushed the sql-invoice-migration branch 5 times, most recently from b6f0ac8 to b983851 Compare September 17, 2024 14:42
@bhandras bhandras changed the title [wip] invoices: migrate KV invoices to native SQL invoices: migrate KV invoices to native SQL for users of KV SQL backends Sep 17, 2024
@bhandras bhandras marked this pull request as ready for review September 17, 2024 14:51
@bhandras bhandras force-pushed the sql-invoice-migration branch 7 times, most recently from 96f0cbe to bfe4ad5 Compare September 19, 2024 15:08
@saubyk saubyk requested review from ziggie1984 and removed request for aakselrod September 19, 2024 15:11
@bhandras bhandras force-pushed the sql-invoice-migration branch 4 times, most recently from d30d10c to 6a6074c Compare September 20, 2024 14:08
@saubyk saubyk requested review from ProofOfKeags and removed request for aakselrod October 1, 2024 16:46
Previously we intentially did not set settled_at and settle_index when
inserting a new invoice as those fields are set when we settle an
invoice through the usual invoice update. As migration requires that we
set these nullable fields, we can safely add them.
This commit adds the migration_tracker table which we'll use to track if
a custom migration has already been done.
Certain invoices may not have a deterministic payment hash. For such
invoices we still store the payment hashes in our KV database, but we do
not have a sufficient index to retrieve them. This PR adds such index to
the SQL database that will be used during migration to retrieve payment
hashes.
This commit runs the invoice migration if the user has a KV SQL backend
configured.
@aakselrod
Copy link
Contributor

Sorry for the lack of review from me, I'll re-review late this week/early next week! I'm just now getting back to working on this project after some other higher-priority stuff landed on my plate.

Comment on lines +208 to +210
// Temporary replace until https://github.com/lightningnetwork/lnd/pull/8831 is
// merged.
replace github.com/lightningnetwork/lnd/sqldb => ./sqldb
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this commit should be dropped.

@@ -235,6 +235,34 @@ func (q *Queries) GetAMPInvoiceID(ctx context.Context, setID []byte) (int64, err
return invoice_id, err
}

const insertAMPSubInvoice = `-- name: InsertAMPSubInvoice :execresult
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd love if you could explain how this magic string is consumed by things. I figured out that it has to do with code generation but I'd like to know what tool consumes this and creates the actual go code InsertAMPSubInvoice

Comment on lines +1 to +12
-- migration_tracker is a table that keeps track of custom migrations that have
-- been run on the database. This table is used to ensure that migrations are
-- idempotent and are only run once.
CREATE TABLE IF NOT EXISTS migration_tracker (
-- migration_id is the id of the migration.
migration_id TEXT NOT NULL,

-- migration_ts is the timestamp at which the migration was run.
migration_ts TIMESTAMP,

PRIMARY KEY (migration_id)
);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did we handle this before?

migration_id TEXT NOT NULL,

-- migration_ts is the timestamp at which the migration was run.
migration_ts TIMESTAMP,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there isn't a really solid reason to abbreviate this as ts I'd rather spell it out as timestamp or just time

@@ -1 +1,2 @@
DROP TABLE IF EXISTS migration_tracker;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this makes more sense to go at the beginning of the PR series. Not a big deal but it seems like this is unrelated to the core of the PR and is more around to give us atomic/idempotence guarantees on migrations.

len(k))
}

copy(paymentHash[:], k)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a dumb question, but why not just put k directly into InsertInvoicePaymentHashAndKeyParams{...}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it was a defense mechanism before loopvar was introduced ?

@@ -135,3 +139,222 @@ func createInvoiceHashIndex(ctx context.Context, db kvdb.Backend,
})
}, func() {})
}

// MigrateSingleInvoice migrates a single invoice to the new SQL schema. Note
// that prefect equality between the old and new schema is not possible as the
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/prefect/perfect/g

InvoiceID: invoiceID,
}

if htlc.MppTotalAmt != 0 {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we excluding the 0 case?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because non-mpp payments don't have this value so we want to keep it null in that case.

)
}

if !htlc.ResolveTime.IsZero() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we excluding the 0 case here too?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we want to keep the resolve time null for still unresolved htlcs

// have the AMP feature bit set and contain AMP HTLCs. Note that this function
// is not supposed to generate correct invoices, but rather random invoices for
// testing the SQL migration.
func generateTestInvoice(t *testing.T, mpp bool, amp bool) *Invoice {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is just a migration code test, and therefore its expected lifetime is small I don't think you should change this, however, it is worth noting that much of this code could have been avoided by using rapid for all of the generation. I mention this just so that next time you encounter the need for this you need not roll your own random gen stuff. We introduced it in #9032

Copy link
Collaborator

@ziggie1984 ziggie1984 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really great work 👌, had a first pass.

Now trying it out on some dbs and different systems to see if we run into memory issues when migrating dbs > 1 mio invoices.

}

// Skip the test if the node is already running with native SQL.
if bob.Cfg.NativeSQL {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm but does this mean bob already migrated ?

if !d.cfg.DB.SkipSQLInvoiceMigration {
err = invoices.MigrateInvoicesToSQL(
ctx, dbs.GraphDB.Backend, dbs.GraphDB,
sqlInvoiceDB, 10,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: define defaults for migration batching


// If the invoice is settled, we'll also set the timestamp and the index
// at which it was settled.
if invoice.State == ContractSettled {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we log an error with we encounter a settled state which has no index and no settledate ?

}

if invoice.Memo != nil {
params.Memo = sql.NullString{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use sqldb.SQLStr

"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/sqldb/sqlc"
)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please describe which invoices have no payment hash in itself but still have the payment_hash index filled ?


const batchSize = 11
err := invpkg.MigrateInvoicesToSQL(
ctxb, store1.Backend, store1, store2, batchSize,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

call store1 boltdb maybe ?

IndexOffset: 0,
// As a sanity check, fetch more invoices than we have
// to ensure that we did not add any extra invoices.
NumMaxInvoices: 9999,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we know how much the db had initially would be an important information here.

result1, err := db.QueryInvoices(ht.Context(), query)
require.NoError(ht, err)

numInvoices := len(result1.Invoices)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why don't we do a length check here for 35 invoices ?

bob.SetExtraArgs([]string{"--db.use-native-sql"})

// Now run the migration flow three times to ensure that each run is
// idempotent.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I do understand it correctly that even though we run it 3 times, the migration only happens once when we start bob via the native sql flag at the beginning ?

// testNativeSQLNoMigration tests that nodes that have invoices would not start
// up with native SQL enabled, as we don't currently support migration of KV
// invoices to the new SQL schema.
func testNativeSQLNoMigration(ht *lntest.HarnessTest) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but we still have a check in place that as soon as I start a boltdb version if the nativesql flag set, that it will fail with a detailed error that these two settings are not supported ?

@lightninglabs-deploy
Copy link

@bhandras, remember to re-request review from reviewers when ready

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
database Related to the database/storage of LND migration
Projects
Status: In Progress
Development

Successfully merging this pull request may close these issues.

5 participants