| 1 |
commit: 7ee36aabda72a4f6006d0fb0810ba8be5e80d9c4 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 22 18:11:52 2016 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 22 18:11:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=7ee36aab |
| 7 |
|
| 8 |
redone remove_old_cpv job |
| 9 |
|
| 10 |
pym/tbc/old_cpv.py | 21 +++++++-------------- |
| 11 |
1 file changed, 7 insertions(+), 14 deletions(-) |
| 12 |
|
| 13 |
diff --git a/pym/tbc/old_cpv.py b/pym/tbc/old_cpv.py |
| 14 |
index cc80428..3c9ffd4 100644 |
| 15 |
--- a/pym/tbc/old_cpv.py |
| 16 |
+++ b/pym/tbc/old_cpv.py |
| 17 |
@@ -9,8 +9,7 @@ from sqlalchemy.orm import scoped_session, sessionmaker |
| 18 |
from tbc.ConnectionManager import NewConnection |
| 19 |
from tbc.readconf import read_config_settings |
| 20 |
from tbc.sqlquerys import get_category_list_info, get_package_list_info, get_ebuild_list_info, \ |
| 21 |
- get_build_job_all, del_old_build_jobs, del_old_ebuild, add_old_package, del_old_package, \ |
| 22 |
- add_old_category |
| 23 |
+ get_build_job_all, del_old_build_jobs, del_old_ebuild, del_old_package, add_old_category |
| 24 |
|
| 25 |
def remove_old_ebuilds(package_id, config_id, tbc_settings, cp): |
| 26 |
today = datetime.utcnow() |
| 27 |
@@ -33,12 +32,13 @@ def remove_old_ebuilds(package_id, config_id, tbc_settings, cp): |
| 28 |
del_old_build_jobs(session2, build_job.BuildJobId) |
| 29 |
del_old_ebuild(session2, EbuildInfo.EbuildId) |
| 30 |
if not get_ebuild_list_info(session2, package_id): |
| 31 |
- add_old_package(session2, package_id) |
| 32 |
+ log_msg = "Removing: %s" % (cp,) |
| 33 |
+ write_log(session2, log_msg, "info", config_id, 'old_cpv.remove_old_cpv_ebuilds') |
| 34 |
+ del_old_package(session2, package_id) |
| 35 |
session2.close |
| 36 |
Session.remove() |
| 37 |
|
| 38 |
def remove_old_cpv_main(session, config_id): |
| 39 |
- today = datetime.datetime.utcnow() |
| 40 |
tbc_settings = read_config_settings() |
| 41 |
# Use all cores when multiprocessing |
| 42 |
#pool_cores = multiprocessing.cpu_count() |
| 43 |
@@ -51,16 +51,9 @@ def remove_old_cpv_main(session, config_id): |
| 44 |
PackagesInfo = get_package_list_info(session, CategoryInfo.CategoryId) |
| 45 |
for PackageInfo in PackagesInfo: |
| 46 |
cp = CategoryInfo.Category + '/' + PackageInfo.Package |
| 47 |
- if PackageInfo.Active: |
| 48 |
- # pool.apply_async( remove_old_ebuilds, (Package.PackageId, config_id, tbc_settings, cp,)) |
| 49 |
- # use this when debuging |
| 50 |
- remove_old_ebuilds(PackageInfo.PackageId, config_id, tbc_settings, cp,) |
| 51 |
- else: |
| 52 |
- duration = today - PackageInfo.TimeStamp |
| 53 |
- if duration.days > 30: |
| 54 |
- log_msg = "Removing: %s" % (cp,) |
| 55 |
- write_log(session2, log_msg, "info", config_id, 'old_cpv.remove_old_cpv_main') |
| 56 |
- del_old_package(session, PackageInfo.PackageId) |
| 57 |
+ # pool.apply_async( remove_old_ebuilds, (Package.PackageId, config_id, tbc_settings, cp,)) |
| 58 |
+ # use this when debuging |
| 59 |
+ remove_old_ebuilds(PackageInfo.PackageId, config_id, tbc_settings, cp,) |
| 60 |
|
| 61 |
#close and join the multiprocessing pools |
| 62 |
# pool.close() |
Archives