Upgrading from 1.9-rr to dev6-rr failed with bzr.dev

Talden talden at gmail.com
Mon Apr 20 23:26:34 BST 2009


Okay, the new bzr.dev has changed things.  The upgrade itself ran
without error (very slowly and producing a resulting repo nearly twice
as large - not counting obsoletepacks of course).

    C:\bzr\test> bzrdev.bat upgrade --development6-rich-root
    starting upgrade of file:///C:/bzr/test/
    making backup of file:///C:/bzr/test/.bzr
      to file:///C:/bzr/test/backup.bzr
    starting repository conversion
    repository converted
    finished

The packed 304M repo became 530M after upgrade so I decided to pack
it.  This blew up:

    -------------------------------------------------------------------------------------------------
    C:\bzr\test> bzrdev.bat upgrade --development6-rich-root
    starting upgrade of file:///C:/bzr/test/
    making backup of file:///C:/bzr/test/.bzr
      to file:///C:/bzr/test/backup.bzr
    starting repository conversion
    repository converted
    finished

    C:\bzr\test> bzrdev.bat pack
    bzr: ERROR: exceptions.ValueError: Delta claimed to be 1808487
long, but ended up 1935319 long

    Traceback (most recent call last):
      File "c:\tools\bzr.dev\bzrlib\commands.py", line 727, in
exception_to_return_code
        return the_callable(*args, **kwargs)
      File "c:\tools\bzr.dev\bzrlib\commands.py", line 922, in run_bzr
        ret = run(*run_argv)
      File "c:\tools\bzr.dev\bzrlib\commands.py", line 559, in run_argv_aliases
        return self.run(**all_cmd_args)
      File "c:\tools\bzr.dev\bzrlib\builtins.py", line 4071, in run
        repository.pack()
      File "c:\tools\bzr.dev\bzrlib\decorators.py", line 192, in write_locked
        result = unbound(self, *args, **kwargs)
      File "c:\tools\bzr.dev\bzrlib\repofmt\pack_repo.py", line 2328, in pack
        self._pack_collection.pack()
      File "c:\tools\bzr.dev\bzrlib\repofmt\pack_repo.py", line 1564, in pack
        self._execute_pack_operations(pack_operations, OptimisingPacker)
      File "c:\tools\bzr.dev\bzrlib\repofmt\groupcompress_repo.py",
line 567, in _execute_pack_operations
        packer.pack()
      File "c:\tools\bzr.dev\bzrlib\repofmt\pack_repo.py", line 739, in pack
        return self._create_pack_from_packs()
      File "c:\tools\bzr.dev\bzrlib\repofmt\groupcompress_repo.py",
line 443, in _create_pack_from_packs
        self._copy_text_texts()
      File "c:\tools\bzr.dev\bzrlib\repofmt\groupcompress_repo.py",
line 426, in _copy_text_texts
        'text', self._get_progress_stream, 4)
      File "c:\tools\bzr.dev\bzrlib\repofmt\groupcompress_repo.py",
line 378, in _copy_stream
        reuse_blocks=False):
      File "c:\tools\bzr.dev\bzrlib\groupcompress.py", line 1379, in
_insert_record_stream
        bytes = record.get_bytes_as('fulltext')
      File "c:\tools\bzr.dev\bzrlib\groupcompress.py", line 353, in get_bytes_as
        self._bytes = block.extract(self.key, self._start, self._end)
      File "c:\tools\bzr.dev\bzrlib\groupcompress.py", line 273, in extract
        bytes = apply_delta_to_source(self._content, content_start, end)
      File "c:\tools\bzr.dev\bzrlib\_groupcompress_py.py", line 392,
in apply_delta_to_source
        return apply_delta(source, delta_bytes)
      File "c:\tools\bzr.dev\bzrlib\_groupcompress_py.py", line 378,
in apply_delta
        ' %d long' % (target_length, len(bytes)))
    ValueError: Delta claimed to be 1808487 long, but ended up 1935319 long

    bzr 1.15dev on python 2.5.2 (win32)
    arguments: ['c:\\tools\\bzr.dev\\bzr', 'pack']
    encoding: 'cp1252', fsenc: 'mbcs', lang: None
    plugins:
      launchpad            c:\tools\bzr.dev\bzrlib\plugins\launchpad [unknown]
      netrc_credential_store
c:\tools\bzr.dev\bzrlib\plugins\netrc_credential_store [unknown]
    *** Bazaar has encountered an internal error.
        Please report a bug at https://bugs.launchpad.net/bzr/+filebug
        including this traceback, and a description of what you
        were doing when the error occurred.
    -------------------------------------------------------------------------------------------------


Here is the .bzr.log for the upgrade and pack:

    -------------------------------------------------------------------------------------------------
    this is a debug log for diagnosing/reporting problems in bzr
    you can delete or truncate this file, or include sections in
    bug reports to https://bugs.launchpad.net/bzr/+filebug

    Tue 2009-04-21 09:32:42 +1200
    0.531  bzr arguments: [u'upgrade', u'--development6-rich-root']
    0.750  looking for plugins in C:/tools/settings/.bzr/bazaar/2.0/plugins
    0.766  looking for plugins in c:\tools\bzr.dev\bzrlib\plugins
    3.687  encoding stdout as sys.stdout encoding 'cp850'
    43.781  creating repository in file:///C:/bzr/test/.bzr/.
    124.795  checking remap as 13 deletions
    125.092  checking remap as 13 deletions
    125.311  checking remap as 7 deletions
    125.498  checking remap as 7 deletions
    126.655  checking remap as 7 deletions
    126.780  checking remap as 7 deletions
    127.514  checking remap as 30 deletions
    127.639  checking remap as 30 deletions
    1788.889  checking remap as 9 deletions
    1788.921  checking remap as 9 deletions
    1791.639  checking remap as 11 deletions
    1791.702  checking remap as 11 deletions
    1792.061  checking remap as 19 deletions
    1792.139  checking remap as 19 deletions
    1792.186  checking remap as 21 deletions
    1792.264  checking remap as 21 deletions
    1792.311  checking remap as 13 deletions
    1792.374  checking remap as 13 deletions
    1792.405  checking remap as 12 deletions
    1792.452  checking remap as 12 deletions
    1792.483  checking remap as 16 deletions
    1792.530  checking remap as 16 deletions
    1792.561  checking remap as 21 deletions
    1792.623  checking remap as 21 deletions
    1792.655  checking remap as 19 deletions
    1792.702  checking remap as 19 deletions
    1792.733  checking remap as 10 deletions
    1792.764  checking remap as 10 deletions
    1840.525  checking remap as 15 deletions
    1840.557  checking remap as 15 deletions
    1840.588  checking remap as 10 deletions
    1840.619  checking remap as 10 deletions
    1841.197  opening working tree 'C:/bzr/test'
    1841.291  opening working tree 'C:/bzr/test'
    1841.291  return code 0

    Tue 2009-04-21 10:09:45 +1200
    0.125  bzr arguments: [u'pack']
    0.140  looking for plugins in C:/tools/settings/.bzr/bazaar/2.0/plugins
    0.140  looking for plugins in c:\tools\bzr.dev\bzrlib\plugins
    0.375  encoding stdout as sys.stdout encoding 'cp850'
    0.515  Packing repository
<bzrlib.repofmt.groupcompress_repo.GCRepositoryPackCollection object
at 0x0131BC10>, which has 4 pack files, containing 326 revisions into
1 packs.
    0.515  repacking 326 revisions
    0.968  repacking 326 inventories
    1.468  repacking chk: 326 id_to_entry roots, 91 p_id_map roots,
7589 total keys
    40.230  repacking 8724 text
    45.308  Traceback (most recent call last):
      File "c:\tools\bzr.dev\bzrlib\commands.py", line 727, in
exception_to_return_code
        return the_callable(*args, **kwargs)
      File "c:\tools\bzr.dev\bzrlib\commands.py", line 922, in run_bzr
        ret = run(*run_argv)
      File "c:\tools\bzr.dev\bzrlib\commands.py", line 559, in run_argv_aliases
        return self.run(**all_cmd_args)
      File "c:\tools\bzr.dev\bzrlib\builtins.py", line 4071, in run
        repository.pack()
      File "c:\tools\bzr.dev\bzrlib\decorators.py", line 192, in write_locked
        result = unbound(self, *args, **kwargs)
      File "c:\tools\bzr.dev\bzrlib\repofmt\pack_repo.py", line 2328, in pack
        self._pack_collection.pack()
      File "c:\tools\bzr.dev\bzrlib\repofmt\pack_repo.py", line 1564, in pack
        self._execute_pack_operations(pack_operations, OptimisingPacker)
      File "c:\tools\bzr.dev\bzrlib\repofmt\groupcompress_repo.py",
line 567, in _execute_pack_operations
        packer.pack()
      File "c:\tools\bzr.dev\bzrlib\repofmt\pack_repo.py", line 739, in pack
        return self._create_pack_from_packs()
      File "c:\tools\bzr.dev\bzrlib\repofmt\groupcompress_repo.py",
line 443, in _create_pack_from_packs
        self._copy_text_texts()
      File "c:\tools\bzr.dev\bzrlib\repofmt\groupcompress_repo.py",
line 426, in _copy_text_texts
        'text', self._get_progress_stream, 4)
      File "c:\tools\bzr.dev\bzrlib\repofmt\groupcompress_repo.py",
line 378, in _copy_stream
        reuse_blocks=False):
      File "c:\tools\bzr.dev\bzrlib\groupcompress.py", line 1379, in
_insert_record_stream
        bytes = record.get_bytes_as('fulltext')
      File "c:\tools\bzr.dev\bzrlib\groupcompress.py", line 353, in get_bytes_as
        self._bytes = block.extract(self.key, self._start, self._end)
      File "c:\tools\bzr.dev\bzrlib\groupcompress.py", line 273, in extract
        bytes = apply_delta_to_source(self._content, content_start, end)
      File "c:\tools\bzr.dev\bzrlib\_groupcompress_py.py", line 392,
in apply_delta_to_source
        return apply_delta(source, delta_bytes)
      File "c:\tools\bzr.dev\bzrlib\_groupcompress_py.py", line 378,
in apply_delta
        ' %d long' % (target_length, len(bytes)))
    ValueError: Delta claimed to be 1808487 long, but ended up 1935319 long

    45.355  Traceback (most recent call last):
      File "c:\tools\bzr.dev\bzrlib\plugin.py", line 407, in _get__version__
        version_string = _format_version_tuple(version_info)
      File "c:\tools\bzr.dev\bzrlib\lazy_import.py", line 125, in __call__
        return obj(*args, **kwargs)
      File "c:\tools\bzr.dev\bzrlib\__init__.py", line 103, in
_format_version_tuple
        raise ValueError("version_info %r not valid" % (version_info,))
    ValueError: version_info (0, 95, 0, 'final', 1) not valid

    45.371  return code 4
    -------------------------------------------------------------------------------------------------

I guess this evidence of either the conversion or the pack doing
something wrong since the repo gave a clean check before the upgrade.
I'll reconvert and do a check immediately after the upgrade to confirm
that the upgrade causes the breakage.

--
Talden



More information about the bazaar mailing list