monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] [PATCH] Broken migration code? (Merging branch to a


From: Stephen Leake
Subject: Re: [Monotone-devel] [PATCH] Broken migration code? (Merging branch to allow duplicate key names, have certs use key hash)
Date: Mon, 24 Aug 2009 04:54:39 -0400
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (windows-nt)

Timothy Brownawell <address@hidden> writes:

> On Thu, 2009-08-20 at 19:37 -0500, Timothy Brownawell wrote:
>> On Fri, 2009-08-14 at 05:04 +0000, Timothy Brownawell wrote:
>> > I think branch net.venge.monotone.keys-by-hash is ready now.
>> > 
>> > The central change is that certs contain a key hash instead of a key
>> > name, to get rid of the problem with key collisions.
>> 
>> > This does require a netsync flag day, because certs on the wire contain
>> > a key hash instead of a key name now (just like certs in the db).
>> 
>> This is merged now.
>
> ...and it looks like I forgot to make the migration code fix the cert
> hashes (which AFAICT are only used for netsync, so possible wierdness if
> people 'db migrate' with out-of-sync db's and then try to sync the
> migrated certs).
>
> I'm getting make errors[1] when I try to build even a clean checkout
> right now, so could someone try this patch and check that the
> lua-testsuite.lua change makes the testsuite fail, 

Yes, at least schema_migration fails

> and the other changes make it pass again?

No. The relevant part of the log:

runcmd: /home/Projects/monotone-build/mtn, local_redir = false, requested = nil
schema_migration:101: /home/Projects/monotone-build/mtn --norc 
--root=/home/Projects/monotone-build/tester_dir/tests/schema_migration 
--confdir=/home/Projects/monotone-build/tester_dir/tests/schema_migration 
--rcfile 
/home/Projects/monotone-build/tester_dir/tests/schema_migration/test_hooks.lua 
--db=/home/Projects/monotone-build/tester_dir/tests/schema_migration/test.db 
--keydir /home/Projects/monotone-build/tester_dir/tests/schema_migration/keys 
address@hidden --db 1db80c7cee8fa966913db1a463ed50bf1b0e5b0e.mtn db execute 
"select hex(hash) from revision_certs"
stdout:
'select hex(hash) from revision_certs' -> 21 rows

ADB37CD94183246AA984D0529DD76593A83A6F97
6EA0AC1980436807CF51953340A5154504524C58
445DCAB09D7DAFEC6D5DFEB2E6BD333A22C8998D
3FE59FD967810C97CB2C9AD982EED94D74106437
C6AAD4B70F193BE703FA542D158D49AAD984BA4A
6C12258AB6F4458722DC1B675C8CC672230B05AE
B827369AE89241746B34503013C437C82B745858
DAB7817B32BD495E07A0DFA5E44C1E624C27D31F
C3DC68C0E904D3D562BF3648D897EC6A225BD63C
BFAE4D24CE61525FCC4B7C585D5A9F37A904D200
45F74888AEF054B7978040FD536CBF9CFB082F09
1B933E609DD14806968E50331F20A04FB1283A4A
E877AED3EF0740A2C5778F3EAF58FD413E24FDDD
2E552A5E39C97B52EB7F105CCF36B48E8AA456BE
60D8BCB5F1CD4721F9F22B594F7FA4DB04AA8516
1339FD579EABAD3A48DBEAC0AA83285A0B470044
15C7FE3E6BCFEEA2883AAA0408479EED74B971FA
618B68A39CB4CEF595642117F973E8DAF427EACE
2F79FD7E4BC7D95E062205C334BFB14C15762131
24A945A23F512DCF5B049DBA123A5F1A4B5617E3
DA32371EED33ED9F1CD5974FF7427344A9DAFB93

stderr:

exit code: 0

schema_migration:101: rename stdout stdout-first
Destination stdout-first exists; removing...
stdin:


runcmd: /home/Projects/monotone-build/mtn, local_redir = false, requested = nil
schema_migration:101: /home/Projects/monotone-build/mtn --norc 
--root=/home/Projects/monotone-build/tester_dir/tests/schema_migration 
--confdir=/home/Projects/monotone-build/tester_dir/tests/schema_migration 
--rcfile 
/home/Projects/monotone-build/tester_dir/tests/schema_migration/test_hooks.lua 
--db=/home/Projects/monotone-build/tester_dir/tests/schema_migration/test.db 
--keydir /home/Projects/monotone-build/tester_dir/tests/schema_migration/keys 
address@hidden --db latest.mtn db execute "select hex(hash) from revision_certs"
stdout:
'select hex(hash) from revision_certs' -> 21 rows

972AFE73ECD4560D442B74503FB5D85DC51109B9
5A325CA256744AC7A0F537676A46F05625D6EEE3
60169E268653E509090465B3B3FF2B55BE1CAB4B
2D26C59E1CFA4A4CEB8BF71B6C258A5E6C40715F
4469A9FD40B05D3C4BFDA124659F5B600DDDF9E7
009C3F44ACC716364454773013B8E444E45BD499
DCF6A300C4906BE912EAACF809AB11C881247A14
39C4B62BBF5597167BC1CF0B1F5E8F509D4D521F
D58935D2945CB8DCC8B975DDF1BDA878A66F188C
8FC714357592B9FA6DE057AA9B1EF9B8F9248CC0
5AB5F460E5CAAB98A1403C1C1785AC39D1282DED
7D7FC520B26C686B124AB3F293DCF9DB82BF7A7E
BA39A26BD638A0E5E753B0BB5B7D7F82679439A1
C8456EB84E054B47D3112C11E5566C39973A65A4
881593D28B9AD1051EC816FAE0CEC852996F85FC
4C45D0DFDA971024DCA2C66063CC785102EEDD3A
AE8B7730461D38111EF907450B8BEC47C79CD476
9C8920131303AC56E0CA8779B6987609C6C226A7
9CB461C68241A0A9D706DCB62FEFD72BCB82EBAE
13E6D8E4A9FF8D036CE0BAAF78CB4BF1D53391BC
05D14E02F9DFD3B077139C3BD3611DBC40732711

stderr:

exit code: 0

schema_migration:101: rename stdout stdout-second
Destination stdout-second exists; removing...

schema_migration:101: readfile stdout-first

schema_migration:101: readfile stdout-second

Check failed: false
stack traceback:
        [string "testlib.lua"]:107: in function 'err'
        [string "testlib.lua"]:808: in function 'check'
        /home/Projects/monotone/lua-testsuite.lua:287: in function 
</home/Projects/monotone/lua-testsuite.lua:282>
        (tail call): ?
        /home/Projects/monotone/lua-testsuite.lua:277: in function 
'check_same_db_contents'
        ...jects/monotone/tests/schema_migration/__driver__.lua:98: in function 
'check_migrate_from'
        ...jects/monotone/tests/schema_migration/__driver__.lua:101: in main 
chunk
        [C]: in function 'xpcall'
        [string "testlib.lua"]:1129: in function <[string "testlib.lua"]:1097>
        [C]: in function 'run_tests_in_children'
        [string "testlib.lua"]:1058: in function <[string "testlib.lua"]:853>

-- 
-- Stephe




reply via email to

[Prev in Thread] Current Thread [Next in Thread]