Revision 47462eda snf-pithos-backend/pithos/backends/lib/hashfiler/mapper.py

b/snf-pithos-backend/pithos/backends/lib/hashfiler/mapper.py
38 38

  
39 39
class Mapper(object):
40 40
    """Mapper.
41
       Required constructor parameters: mappath, namelen, mappool.
41
       Required constructor parameters: mappath, namelen.
42
       Optional mappool.
42 43
    """
43 44

  
44 45
    def __init__(self, **params):
45
        params['mappool'] = 'maps'
46
        self.rmap = RadosMapper(**params)
47
        self.fmap = FileMapper(**params)
48

  
49
#    def _get_rear_map(self, maphash, create=0):
50
#        return self.fmap._get_rear_map(maphash, create)
46
        self.rmap = None
47
        try:
48
            if params['mappool']:
49
                self.rmap = RadosMapper(**params)
50
        except:
51
            pass
51 52

  
52
#    def _check_rear_map(self, maphash):
53
#        return self.rmap._check_rear_map(maphash)
54
#        return self.rmap._check_rear_map(maphash) and
55
#                self.fmap._check_rear_map(maphash)
53
        self.fmap = FileMapper(**params)
56 54

  
57 55
    def map_retr(self, maphash, blkoff=0, nr=100000000000000):
58 56
        """Return as a list, part of the hashes map of an object
......
63 61

  
64 62
    def map_stor(self, maphash, hashes=(), blkoff=0, create=1):
65 63
        """Store hashes in the given hashes map."""
66
        self.rmap.map_stor(maphash, hashes, blkoff, create)
64
        if self.rmap:
65
            self.rmap.map_stor(maphash, hashes, blkoff, create)
67 66
        self.fmap.map_stor(maphash, hashes, blkoff, create)

Also available in: Unified diff