sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Entropy/database split:

Browse Source 
- some changes to allow easy branch migration through the 'switchbranch' tool


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2498 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2008-10-08 13:36:40 +00:00
parent 30782e37ed
commit b5ec9b033d
3 changed files with 65 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
libraries/entropy.py
View File

@@ -14962,7 +14962,6 @@ class ServerInterface(TextInterface):
os.makedirs(my_branched_dir)
const_setup_perms(my_branched_dir,etpConst['entropygid'])
# get_local_database_dir
for repo_file in repo_files:
repo_filename = os.path.basename(repo_file)
shutil.move(repo_file,os.path.join(my_branched_dir,repo_filename))
@@ -15304,7 +15303,8 @@ class ServerInterface(TextInterface):
indexing = True,
warnings = True,
do_cache = True,
use_branch = None
use_branch = None,
lock_remote = True
):
if repo == None:
@@ -15332,6 +15332,7 @@ class ServerInterface(TextInterface):
repo,
t_ident,
use_branch,
lock_remote,
)
)
if cached != None:
@@ -15340,7 +15341,7 @@ class ServerInterface(TextInterface):
if not os.path.isdir(os.path.dirname(local_dbfile)):
os.makedirs(os.path.dirname(local_dbfile))
if not read_only:
if (not read_only) and (lock_remote):
self.doServerDatabaseSyncLock(repo, no_upload)
conn = EntropyDatabaseInterface(
@@ -15349,7 +15350,9 @@ class ServerInterface(TextInterface):
noUpload = no_upload,
OutputInterface = self,
ServiceInterface = self,
dbname = etpConst['serverdbid']+repo
dbname = etpConst['serverdbid']+repo,
useBranch = use_branch,
lockRemote = lock_remote
)
valid = True
@@ -15400,6 +15403,7 @@ class ServerInterface(TextInterface):
repo,
t_ident,
use_branch,
lock_remote
)] = conn
return conn
@@ -17064,19 +17068,41 @@ class ServerInterface(TextInterface):
return fine, failed, downloaded_fine, downloaded_errors
def switch_packages_branch(self, idpackages, to_branch, repo = None):
def switch_packages_branch(self, idpackages, from_branch, to_branch, repo = None):
if repo == None:
repo = self.default_repository
mytxt = red("%s ...") % (_("Switching selected packages"),)
if to_branch != etpConst['branch']:
mytxt = "%s: %s %s" % (blue(_("Please setup your branch to")),bold(to_branch),blue(_("and retry")),)
self.updateProgress(
mytxt,
importance = 1,
type = "error",
header = darkred(" !! ")
)
return None
mytxt = red("%s ...") % (_("Moving database (if not exists)"),)
self.updateProgress(
mytxt,
importance = 1,
type = "info",
header = darkgreen(" @@ ")
)
dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo)
branch_dbdir = self.get_local_database_dir(repo)
old_branch_dbdir = self.get_local_database_dir(repo, from_branch)
if (not os.path.isdir(branch_dbdir)) and os.path.isdir(old_branch_dbdir):
shutil.copytree(old_branch_dbdir,branch_dbdir)
mytxt = red("%s ...") % (_("Switching packages"),)
self.updateProgress(
mytxt,
importance = 1,
type = "info",
header = darkgreen(" @@ ")
)
dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo, lock_remote = False)
already_switched = set()
not_found = set()
@@ -17118,7 +17144,10 @@ class ServerInterface(TextInterface):
header = darkgreen(" @@ "),
back = True
)
dbconn.switchBranch(idpackage,to_branch)
switch_status = dbconn.switchBranch(idpackage,to_branch)
if not switch_status:
# remove idpackage
dbconn.removePackage(idpackage)
dbconn.commitChanges()
switched.add(idpackage)
@@ -27354,7 +27383,7 @@ class ServerMirrorsInterface:
header = blue(" @@ ")
)
self.Entropy.updateProgress(
"%s:\t%s" % (
"%s:\t\t%s" % (
darkgreen(_("Packages to be moved locally")),
darkgreen(str(len(copy))),
),
@@ -28270,9 +28299,11 @@ class EntropyDatabaseInterface:
OutputInterface = None,
ServiceInterface = None,
skipChecks = False, # dangerous!
useBranch = None
useBranch = None,
lockRemote = True
):
self.lockRemote = lockRemote
self.db_branch = etpConst['branch']
if useBranch != None: self.db_branch = useBranch
@@ -28553,7 +28584,8 @@ class EntropyDatabaseInterface:
header = brown(" * ")
)
# lock database
self.ServiceInterface.doServerDatabaseSyncLock(self.server_repo, self.noUpload)
if self.lockRemote:
self.ServiceInterface.doServerDatabaseSyncLock(self.server_repo, self.noUpload)
# now run queue
try:
self.runTreeUpdatesActions(update_actions)
@@ -31467,17 +31499,17 @@ class EntropyDatabaseInterface:
# if there are entries already, remove idpackage directly
my_idpackage, result = self.atomMatch(key, matchSlot = slot, matchBranches = (tobranch,))
if my_idpackage != -1:
self.removePackage(idpackage) # remove the one with the old branch
else:
# otherwise, update the old one (set the new branch)
self.WriteLock.acquire()
try:
self.cursor.execute('UPDATE baseinfo SET branch = (?) WHERE idpackage = (?)', (tobranch,idpackage,))
self.commitChanges()
self.clearCache()
finally:
self.WriteLock.release()
if my_idpackage != -1: return False
# otherwise, update the old one (set the new branch)
self.WriteLock.acquire()
try:
self.cursor.execute('UPDATE baseinfo SET branch = (?) WHERE idpackage = (?)', (tobranch,idpackage,))
self.commitChanges()
self.clearCache()
finally:
self.WriteLock.release()
return True
def databaseStructureUpdates(self):

2
server/reagent.py
View File

@@ -74,7 +74,7 @@ myopts = [
(2,'remove',4,_('remove the provided atoms from the current repository database')),
(2,'multiremove',3,_('remove the provided injected atoms (all if no atom specified)')),
(2,'create-empty-database',2,_('create an empty repository database in the provided path')),
(2,'switchbranch <new_branch>',3,_('switch to the specified branch the provided atoms (or world)')),
(2,'switchbranch <from branch> <to branch>',3,_('switch to the specified branch the repository')),
(2,'md5check',3,_('verify integrity of the provided atoms (or world)')),
(2,'md5remote',3,_('verify remote integrity of the provided atoms (or world)')),
None,

29
server/server_reagent.py
View File

@@ -322,28 +322,16 @@ def database(options):
print_error(brown(" * ")+red(_("Not enough parameters")))
return 1
switchbranch = options[1]
from_branch = options[1]
to_branch = options[2]
print_info(darkgreen(" * ")+red(_("Switching branch, be sure to have your packages in sync.")))
print_info(darkgreen(" * ")+red("%s %s..." % (_("Collecting packages that would be marked"),switchbranch,) ), back = True)
print_info(darkgreen(" * ")+red("%s %s..." % (_("Collecting packages that would be marked"),to_branch,) ), back = True)
dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True)
pkglist = set()
myatoms = options[2:]
if "world" in myatoms:
pkglist |= dbconn.listAllIdpackages()
else:
for atom in myatoms:
match = dbconn.atomMatch(atom)
if match == -1:
print_warning(brown(" * ")+red("%s: " % (_("Cannot match"),) )+bold(atom))
else:
pkglist.add(match[0])
pkglist = dbconn.listAllIdpackages(branch = from_branch)
myatoms = options[3:]
if not pkglist:
print_error(brown(" * ")+red("%s." % (_("No packages found"),) ))
return 3
print_info(darkgreen(" * ")+red("%s %s:" % (_("These are the packages that would be marked"),switchbranch,)))
print_info(darkgreen(" * ")+red("%s %s:" % (_("These are the packages that would be marked"),to_branch,)))
for idpackage in pkglist:
atom = dbconn.retrieveAtom(idpackage)
print_info(red(" # ")+bold(atom))
@@ -352,7 +340,10 @@ def database(options):
if rc == "No":
return 4
switched, already_switched, ignored, not_found, no_checksum = Entropy.switch_packages_branch(pkglist, to_branch = switchbranch)
status = Entropy.switch_packages_branch(pkglist, from_branch, to_branch)
if status == None:
return 1
switched, already_switched, ignored, not_found, no_checksum = status
if not_found or no_checksum:
return 1
return 0