bugmonotone - Bugs: bug #17031, mtn crashes on merge.

 
 

You are not allowed to post comments on this tracker with your current authentication level.

bug #17031: mtn crashes on merge.

Submitted by:  None
Submitted on:  Wed 05 Jul 2006 12:57:45 AM UTC  
 
Category: merge algorithmSeverity: 3 - Normal
Item Group: crashStatus: Fixed
Privacy: PublicAssigned to: None
Open/Closed: Closed
mtn version --full: 

monotone 0.27 (base revision: 341e4a18c594cec49896fa97bd4e74de7bee5827)
Running on : Linux 2.4.21-15.ELsmp #1 SMP Thu Apr 22 00:09:01 EDT 2004 x86_64
C++ compiler : GNU C++ version 3.4.2
C++ standard library: GNU libstdc++ version 20040906
Boost version : 1_33_1
Changes since base revision:
format_version "1"

new_manifest [8e9ac81ef37aa9c0334b97d46467a8ee61450078]

old_revision [341e4a18c594cec49896fa97bd4e74de7bee5827]

Generated from data cached in the distribution;
further changes may have been made.

Thu 06 Jul 2006 05:14:18 AM UTC, comment #5:

Thanks for the quick resolution!

Jack Cummings <necronom>
Thu 06 Jul 2006 12:26:04 AM UTC, comment #4:

Okay, it was a real bug -- failing test committed in 6e6461b6706fb37704d361feb8dfb6c461bef02f, fix committed in 576d79ab24903cda57d83e3fb14e947354edd628, original reporter confirms fix works for him.

Nathaniel Smith <njs>
Project Member
Wed 05 Jul 2006 03:14:21 PM UTC, comment #3:

Recompiled boost and monotone with gcc-4.1.1, and it still segfaults.

Next step: a better gdb?

--Jack

Jack Cummings <necronom>
Wed 05 Jul 2006 04:03:23 AM UTC, comment #2:

I suspect as much as well.

/me wanders off build a new toolchain..

Jack Cummings <necronom>
Wed 05 Jul 2006 02:55:12 AM UTC, comment #1:

I almost wonder if this is a problem with an old compiler? Either the backtrace or the library has to be wrong; just calling 'find' on a map cannot segfault unless something is going very wrong outside of our control.

(--njs, too lazy to log in)

Anonymous
Wed 05 Jul 2006 12:57:45 AM UTC, original submission:

Doing a propagate/explicit_merge between two revisions that have similar merge_into_dirs done at similar points causes MTN to segfault:

GNU gdb Red Hat Linux (6.0post-0.20040223.17rh)
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB. Type "show warranty" for details.
This GDB was configured as "x86_64-redhat-linux-gnu"...Using host libthread_db library "/lib64/tls/libthread_db.so.1".

(gdb) r explicit_merge 86df63e3f5d48dbf1b5c82336da6c7f54540aa6e 4758ee242a47fb06b6d873b387bbb1013f9f916d foo
Starting program: /home/cummings/bin/mtn explicit_merge 86df63e3f5d48dbf1b5c82336da6c7f54540aa6e 4758ee242a47fb06b6d873b387bbb1013f9f916d foo
mtn: [source] 86df63e3f5d48dbf1b5c82336da6c7f54540aa6e
mtn: [source] 4758ee242a47fb06b6d873b387bbb1013f9f916d

Program received signal SIGSEGV, Segmentation fault.
std::_Rb_tree<unsigned int, std::pair<unsigned int const, boost::shared_ptr<node> >, std::_Select1st<std::pair<unsigned int const, boost::shared_ptr<node> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, boost::shared_ptr<node> > > >::find (this=0x8, __k=@0xffff3004) at stl_tree.h:464
464 { return static_cast<_Const_Link_type>(this->_M_impl._M_header._M_parent); }
(gdb) bt
#0 std::_Rb_tree<unsigned int, std::pair<unsigned int const, boost::shared_ptr<node> >, std::_Select1st<std::pair<unsigned int const, boost::shared_ptr<node> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, boost::shared_ptr<node> > > >::find (this=0x8, __k=@0xffff3004) at stl_tree.h:464
#1 0x08243866 in roster_t::has_node (this=0xc, n=3924) at stl_map.h:513
#2 0x08108666 in content_merge_database_adaptor::get_ancestral_roster (this=0xffff32c0, nid=3924, anc=@0xffff31f0) at shared_ptr.hpp:252
#3 0x082ae1e7 in resolve_merge_conflicts (left_rid=@0xffff35f0, right_rid=@0xffff35e0, left_roster=@0xffff3470, right_roster=@0xffff3410, left_marking_map=@0xffff3450, right_marking_map=@0xffff33f0, result=@0xffff3300,
adaptor=@0xffff32c0, app=@0xffff3820) at merge.cc:81
#4 0x082aedf1 in interactive_merge_and_store (left_rid=@0xffff35f0, right_rid=@0xffff35e0, merged_rid=@0x8, app=@0xffff3820) at merge.cc:148
#5 0x080d14b9 in commands::cmd_explicit_merge::exec (this=0x851a760, app=@0xffff3820, args=@0x3e8) at cmd_merging.cc:552
#6 0x080b1232 in commands::process (app=@0xffff3820, cmd=@0xffff3800, args=@0x8) at stl_map.h:332
#7 0x082baabe in cpp_main (argc=138623368, argv=0xffff4184) at monotone.cc:643
#8 0x082bc468 in main_with_signal_handlers (argc=5, argv=0xffff4184) at main.cc:304
#9 0x082bc640 in main (argc=8, argv=0x8) at main.cc:374

--Jack

Anonymous

 

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

Do you think this task is very important?
If so, you can click here to add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.

 

Please enter the title of George Orwell's famous dystopian book (it's a date):

 

 

Follow 3 latest changes.

Date Changed By Updated Field Previous Value => Replaced By
Thu 06 Jul 2006 12:26:04 AM UTCnjsStatusNone=>Fixed
  Open/ClosedOpen=>Closed
Wed 05 Jul 2006 03:48:34 AM UTCnecronomCarbon-Copy-=>Added -unavailable-

Back to the top


Powered by Savane 3.1-cleanup1