1
=== modified file 'NEWS'
2
--- NEWS	2009-12-18 22:03:09 +0000
3
+++ NEWS	2009-12-21 16:48:15 +0000
4
@@ -31,6 +31,10 @@
5
31
  This will likely have an impact on any other process that is serving for
31
  This will likely have an impact on any other process that is serving for
6
32
  an extended period of time.  (John Arbash Meinel, #494406)
32
  an extended period of time.  (John Arbash Meinel, #494406)
7
33
33
8
34
* The 2a format wasn't properly restarting autopacks when something
9
35
  changed underneath it (like another autopack). Now concurrent
10
36
  autopackers will properly succeed. (John Arbash Meinel, #495000)
11
37
12
34
Improvements
38
Improvements
13
35
************
39
************
14
36
40
15
37
41
16
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
17
--- bzrlib/repofmt/groupcompress_repo.py	2009-09-24 20:03:43 +0000
18
+++ bzrlib/repofmt/groupcompress_repo.py	2009-12-21 16:48:15 +0000
19
@@ -352,7 +352,8 @@
20
352
        """Build a VersionedFiles instance on top of this group of packs."""
352
        """Build a VersionedFiles instance on top of this group of packs."""
21
353
        index_name = index_name + '_index'
353
        index_name = index_name + '_index'
22
354
        index_to_pack = {}
354
        index_to_pack = {}
24
355
        access = knit._DirectPackAccess(index_to_pack)
355
        access = knit._DirectPackAccess(index_to_pack,
25
356
                                        reload_func=self._reload_func)
26
356
        if for_write:
357
        if for_write:
27
357
            # Use new_pack
358
            # Use new_pack
28
358
            if self.new_pack is None:
359
            if self.new_pack is None:
29
359
360
30
=== modified file 'bzrlib/tests/per_pack_repository.py'
31
--- bzrlib/tests/per_pack_repository.py	2009-09-07 03:00:23 +0000
32
+++ bzrlib/tests/per_pack_repository.py	2009-12-21 16:48:15 +0000
33
@@ -546,6 +546,42 @@
34
546
        finally:
546
        finally:
35
547
            tree.unlock()
547
            tree.unlock()
36
548
548
37
549
    def test_concurrent_pack_during_autopack(self):
38
550
        tree = self.make_branch_and_tree('tree')
39
551
        tree.lock_write()
40
552
        try:
41
553
            for i in xrange(9):
42
554
                tree.commit('rev %d' % (i,))
43
555
            r2 = repository.Repository.open('tree')
44
556
            r2.lock_write()
45
557
            try:
46
558
                # Monkey patch so that pack occurs while the other repo is
47
559
                # autopacking. This is slightly bad, but all current pack
48
560
                # repository implementations have a _pack_collection, and we
49
561
                # test that it gets triggered. So if a future format changes
50
562
                # things, the test will fail rather than succeed accidentally.
51
563
                autopack_count = [0]
52
564
                r1 = tree.branch.repository
53
565
                orig = r1._pack_collection.pack_distribution
54
566
                def trigger_during_auto(*args, **kwargs):
55
567
                    ret = orig(*args, **kwargs)
56
568
                    if not autopack_count[0]:
57
569
                        r2.pack()
58
570
                    autopack_count[0] += 1
59
571
                    return ret
60
572
                r1._pack_collection.pack_distribution = trigger_during_auto
61
573
                tree.commit('autopack-rev')
62
574
                # This triggers 2 autopacks. The first one causes r2.pack() to
63
575
                # fire, but r2 doesn't see the new pack file yet. The
64
576
                # autopack restarts and sees there are 2 files and there
65
577
                # should be only 1 for 10 commits. So it goes ahead and
66
578
                # finishes autopacking.
67
579
                self.assertEqual([2], autopack_count)
68
580
            finally:
69
581
                r2.unlock()
70
582
        finally:
71
583
            tree.unlock()
72
584
73
549
    def test_lock_write_does_not_physically_lock(self):
585
    def test_lock_write_does_not_physically_lock(self):
74
550
        repo = self.make_repository('.', format=self.get_format())
586
        repo = self.make_repository('.', format=self.get_format())
75
551
        repo.lock_write()
587
        repo.lock_write()
Reviewer	Review Type	Date Requested	Status
Martin Pool		2009-12-16	Approve on 2009-12-21
Review via email: mp+16264@code.launchpad.net