23.02 Startup - Large Node - SCID issue

[CMDRZOD]

Hi there. I attempted to download and use the Ubuntu 20.04 binary for upgrading my node. After allowing the database upgrade I get the following error:

2023-03-05T15:59:37.873Z INFO    lightningd: Updating database from version 199 to 216
2023-03-05T16:00:09.433Z **BROKEN** lightningd: migrate_channels_scids_as_integers: converting channels.short_channel_id '607622x1712x0' gave 2 changes != 1!                                                                                   2023-03-05T16:00:09.434Z **BROKEN** lightningd: migrate_channels_scids_as_integers: converting channels.short_channel_id '607622x1712x0' gave 2 changes != 1!                                                                                   2023-03-05T16:00:09.435Z **BROKEN** lightningd: migrate_channels_scids_as_integers: converting channels.short_channel_id '607622x1712x1' gave 2 changes != 1!                                                                                   2023-03-05T16:00:09.436Z **BROKEN** lightningd: migrate_channels_scids_as_integers: converting channels.short_channel_id '607622x1712x1' gave 2 changes != 1!                                                                                   migrate_channels_scids_as_integers: only converted 694 of 690 scids!

Once this error occurs the startup of the node fails.
My node:
https://1ml.com/node/02a20247f515d978cbf9e9ce6a4287b5931d724068b7b88bbaead6380db3dd8e9a
Thanks

[CMDRZOD]

Looks like this is similar to my problem with the previous release:
#5760 (comment)

[rustyrussell]

Hmm, I suspect we're hitting the new fatal check, does this help?

diff --git a/wallet/db.c b/wallet/db.c
index 5a5a1c78f..ea2e2d067 100644
--- a/wallet/db.c
+++ b/wallet/db.c
@@ -1532,8 +1532,8 @@ static void migrate_channels_scids_as_integers(struct lightningd *ld,
 	}
 
 	if (changes != tal_count(scids))
-		fatal("migrate_channels_scids_as_integers: only converted %zu of %zu scids!",
-		      changes, tal_count(scids));
+		log_broken(ld->log, "migrate_channels_scids_as_integers: only converted %zu of %zu scids!",
+			   changes, tal_count(scids));
 
 	/* FIXME: We cannot use ->delete_columns to remove
 	 * short_channel_id, as other tables reference the channels

[CMDRZOD]

Currently attempting to compile from source with patch applied. Running into errors. This is why I wait for bin files from releases.
Building on Ubuntu 20.04 server with prerequisites installed:
cd external/libwally-core && ./tools/autogen.sh /bin/sh: 1: ./tools/autogen.sh: not found make: *** [external/Makefile:83: external/x86_64-linux-gnu/libwally-core-build/src/libwallycore.la] Error 127

[CMDRZOD]

Okay I pulled from git, had to disable rust to get this to build on Ubuntu 20.04. Can confirm changes allow my node to start up successfully. Thank you!
2023-03-07T20:28:43.795Z INFO lightningd: Updating database from version 199 to 216 2023-03-07T20:30:36.763Z **BROKEN** lightningd: migrate_channels_scids_as_integers: converting channels.short_channel_id '607622x1712x0' gave 2 changes != 1! 2023-03-07T20:30:36.764Z **BROKEN** lightningd: migrate_channels_scids_as_integers: converting channels.short_channel_id '607622x1712x0' gave 2 changes != 1! 2023-03-07T20:30:36.766Z **BROKEN** lightningd: migrate_channels_scids_as_integers: converting channels.short_channel_id '607622x1712x1' gave 2 changes != 1! 2023-03-07T20:30:36.767Z **BROKEN** lightningd: migrate_channels_scids_as_integers: converting channels.short_channel_id '607622x1712x1' gave 2 changes != 1! 2023-03-07T20:30:36.979Z **BROKEN** lightningd: migrate_channels_scids_as_integers: only converted 694 of 690 scids!

"version": "v23.02-6-gb5c6140-modded",