extras-buildsys/common AuthedXMLRPCServer.py,1.6.4.2,1.6.4.3
by fedora-extras-commits@redhat.com
Author: dcbw
Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21093/common
Modified Files:
Tag: STABLE_0_4
AuthedXMLRPCServer.py
Log Message:
Small fix
Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -u -r1.6.4.2 -r1.6.4.3
--- AuthedXMLRPCServer.py 1 Dec 2005 03:16:43 -0000 1.6.4.2
+++ AuthedXMLRPCServer.py 1 Dec 2005 03:20:32 -0000 1.6.4.3
@@ -106,7 +106,7 @@
def ping(self, callerid, trynum):
authinfo = get_authinfo()
print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo)
- return "pong %d / %d" % (num, trynum)
+ return "pong %d / %d" % (callerid, trynum)
class TestServer(AuthedSSLXMLRPCServer):
"""
18 years
extras-buildsys/server Config.py, 1.11, 1.12 PackageJob.py, 1.39, 1.40 Repo.py, 1.20, 1.21
by fedora-extras-commits@redhat.com
Author: dcbw
Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008/server
Modified Files:
Config.py PackageJob.py Repo.py
Log Message:
Make the test a bit more informative
Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Config.py 26 Nov 2005 06:10:22 -0000 1.11
+++ Config.py 1 Dec 2005 03:17:25 -0000 1.12
@@ -95,6 +95,8 @@
def save_default_config(self, filename=None):
self.add_section("General")
self.set_option("General", "hostname", "localhost")
+ self.set_option("General", "traceback_server", "no")
+ self.set_option("General", "depsolve_jobs", "yes")
self.add_section("Directories")
self.set_option("Directories", "server_work_dir", "/rpmbuild",)
Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- PackageJob.py 29 Nov 2005 06:41:51 -0000 1.39
+++ PackageJob.py 1 Dec 2005 03:17:26 -0000 1.40
@@ -154,8 +154,11 @@
self._result_dir = None
self._srpm_path = None
self._srpm_http_path = None
+
self._depsolve_dir = None
self._last_depsolve_error = None
+ self._depsolve_first_try = False
+
self.repofiles = {}
self.archjobs = {}
self._archjobs_lock = threading.Lock()
@@ -404,10 +407,14 @@
""" % (self._source, pkg_arches, allowed_arches)
raise PrepError(msg)
- self._set_cur_stage('depsolve_wait')
- log("%s (%s): Requesting depsolve..." % (self.uid, self.package))
- self._repo.request_depsolve(self, first_try=True)
- return True # sleep until the Repo wakes us up for depsolve
+ if self._server_cfg.get_bool("General", "depsolve_jobs"):
+ self._set_cur_stage('depsolve_wait')
+ log("%s (%s): Requesting depsolve..." % (self.uid, self.package))
+ self._repo.request_depsolve(self, first_try=True)
+ return True # sleep until the Repo wakes us up for depsolve
+ else:
+ # Don't depsolve, just queue archjobs and wait
+ return self._prepare_and_wait()
def _write_yum_conf(self, arch):
# Figure out which mock config file it is, and write out it's yum.conf
@@ -492,7 +499,8 @@
del base, srpm
return success
- def start_depsolve(self):
+ def start_depsolve(self, first_try=False):
+ self._depsolve_first_try = first_try
self._set_cur_stage('depsolve')
self.wake()
@@ -530,9 +538,11 @@
log("%s (%s): Starting depsolve for arches: %s." % (self.uid, self.package, archlist))
+ failed_arch = None
for arch in archlist:
if self._arch_deps_solved(arch) == False:
unsolved_deps = True
+ failed_arch = arch
break
self._archjobs_lock.release()
@@ -540,6 +550,15 @@
self._repo.notify_depsolve_done(self)
if unsolved_deps == True:
+ # Notify the queuer of the job that it's failed the first depsolve
+ if self._depsolve_first_try:
+ subject = 'Dependency Problem: %d - %s on %s' % (self.uid, self.name, self._target_str)
+ sender = self._server_cfg.get_str("Email", "email_from")
+ msg = """This job failed its initial dependency test. The build server will
+periodically try to build the job for the next 8 hours.
+Error on %s: %s""" % (failed_arch, self._last_depsolve_error)
+ EmailUtils.email_result(sender, self.username, msg, subject)
+
# Go to sleep until the repo changes
self._set_cur_stage('depsolve_wait')
self._repo.request_depsolve(self, first_try=False)
@@ -552,7 +571,10 @@
shutil.rmtree(self._depsolve_dir, ignore_errors=True)
self._depsolve_dir = None
- # Queue up the archjobs
+ return self._prepare_and_wait()
+
+ def _prepare_and_wait(self):
+ # Make some directories we need
work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
self._result_dir = self._make_stage_dir(work_dir)
for arch in self.archjobs.keys():
@@ -570,6 +592,7 @@
if self.use_cvs == True:
shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
+ # Queue up archjobs
self._set_cur_stage('waiting')
self._request_arch_jobs()
return False
Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Repo.py 29 Nov 2005 06:41:51 -0000 1.20
+++ Repo.py 1 Dec 2005 03:17:26 -0000 1.21
@@ -133,7 +133,7 @@
archjob.repo_unlocked_callback()
self._repo_unlock_lock.release()
- def _start_depsolves_for_queue(self, queue, max_jobs):
+ def _start_depsolves_for_queue(self, queue, max_jobs, first_try=False):
num = 0
for job in queue:
if queue[job]:
@@ -146,7 +146,7 @@
break
if not queue[job]:
queue[job] = True
- job.start_depsolve()
+ job.start_depsolve(first_try)
available = available - 1
def _start_waiting_depsolves(self, repo_changed=False):
@@ -161,11 +161,11 @@
max_again_depsolves = self.MAX_DEPSOLVE_JOBS / 2
max_immediate_depsolves = self.MAX_DEPSOLVE_JOBS / 2
- self._start_depsolves_for_queue(self._depsolve_immediate_queue, max_immediate_depsolves)
+ self._start_depsolves_for_queue(self._depsolve_immediate_queue, max_immediate_depsolves, first_try=True)
# Only fire off non-first-try depsolves if the repo has changed
if repo_changed:
- self._start_depsolves_for_queue(self._depsolve_again_queue, max_again_depsolves)
+ self._start_depsolves_for_queue(self._depsolve_again_queue, max_again_depsolves, first_try=False)
self._depsolve_again_lock.release()
self._depsolve_immediate_lock.release()
18 years
extras-buildsys/common AuthedXMLRPCServer.py, 1.7, 1.8 XMLRPCServerProxy.py, 1.6, 1.7
by fedora-extras-commits@redhat.com
Author: dcbw
Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008/common
Modified Files:
AuthedXMLRPCServer.py XMLRPCServerProxy.py
Log Message:
Make the test a bit more informative
Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AuthedXMLRPCServer.py 25 Nov 2005 04:45:07 -0000 1.7
+++ AuthedXMLRPCServer.py 1 Dec 2005 03:17:20 -0000 1.8
@@ -103,10 +103,10 @@
###########################################################
class ReqHandler:
- def ping(self):
+ def ping(self, callerid, trynum):
authinfo = get_authinfo()
- print "AUTHINFO: %s" % authinfo
- return "pong"
+ print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo)
+ return "pong %d / %d" % (num, trynum)
class TestServer(AuthedSSLXMLRPCServer):
"""
@@ -119,8 +119,7 @@
def auth_cb(self, request, client_address):
import random
peer_cert = request.get_peer_certificate()
- email = peer_cert.get_subject().countryName
- return "AUTH: %s - %d" % (email, random.randint(1, 100))
+ return peer_cert.get_subject().emailAddress
if __name__ == '__main__':
Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLRPCServerProxy.py 25 Nov 2005 04:45:07 -0000 1.6
+++ XMLRPCServerProxy.py 1 Dec 2005 03:17:20 -0000 1.7
@@ -64,8 +64,9 @@
_lock = threading.Lock()
class TestClient(threading.Thread):
- def __init__(self, certs):
+ def __init__(self, certs, num):
self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20)
+ self.num = i
threading.Thread.__init__(self)
def run(self):
@@ -74,7 +75,8 @@
i = 0
while i < 5:
# _lock.acquire()
- print self.server.ping()
+ reply = self.server.ping(self.num, i)
+ print "TRY(%d / %d): %s" % (self.num, i, reply)
time.sleep(0.05)
# _lock.release()
i = i + 1
@@ -92,7 +94,7 @@
i = 100
while i > 0:
- t = TestClient(certs)
+ t = TestClient(certs, i)
print "Created thread %d." % i
t.start()
i = i - 1
18 years
extras-buildsys ChangeLog,1.155,1.156
by fedora-extras-commits@redhat.com
Author: dcbw
Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008
Modified Files:
ChangeLog
Log Message:
Make the test a bit more informative
Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog 29 Nov 2005 06:41:40 -0000 1.155
+++ ChangeLog 1 Dec 2005 03:17:15 -0000 1.156
@@ -1,5 +1,10 @@
2005-11-29 Dan Williams <dcbw(a)redhat.com>
+ * Add an option in the server config file to disable
+ depsolving
+
+2005-11-29 Dan Williams <dcbw(a)redhat.com>
+
* Add a traceback server that listens on a Unix socket
and writes backtraces for all threads to it. Disabled
by default.
18 years
extras-buildsys/common AuthedXMLRPCServer.py, 1.6.4.1, 1.6.4.2 XMLRPCServerProxy.py, 1.5.4.1, 1.5.4.2
by fedora-extras-commits@redhat.com
Author: dcbw
Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20987/common
Modified Files:
Tag: STABLE_0_4
AuthedXMLRPCServer.py XMLRPCServerProxy.py
Log Message:
Make the test a bit more informative
Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- AuthedXMLRPCServer.py 24 Nov 2005 22:32:02 -0000 1.6.4.1
+++ AuthedXMLRPCServer.py 1 Dec 2005 03:16:43 -0000 1.6.4.2
@@ -103,10 +103,10 @@
###########################################################
class ReqHandler:
- def ping(self):
+ def ping(self, callerid, trynum):
authinfo = get_authinfo()
- print "AUTHINFO: %s" % authinfo
- return "pong"
+ print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo)
+ return "pong %d / %d" % (num, trynum)
class TestServer(AuthedSSLXMLRPCServer):
"""
@@ -119,8 +119,7 @@
def auth_cb(self, request, client_address):
import random
peer_cert = request.get_peer_certificate()
- email = peer_cert.get_subject().countryName
- return "AUTH: %s - %d" % (email, random.randint(1, 100))
+ return peer_cert.get_subject().emailAddress
if __name__ == '__main__':
Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- XMLRPCServerProxy.py 24 Nov 2005 22:32:02 -0000 1.5.4.1
+++ XMLRPCServerProxy.py 1 Dec 2005 03:16:43 -0000 1.5.4.2
@@ -64,8 +64,9 @@
_lock = threading.Lock()
class TestClient(threading.Thread):
- def __init__(self, certs):
+ def __init__(self, certs, num):
self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20)
+ self.num = i
threading.Thread.__init__(self)
def run(self):
@@ -74,7 +75,8 @@
i = 0
while i < 5:
# _lock.acquire()
- print self.server.ping()
+ reply = self.server.ping(self.num, i)
+ print "TRY(%d / %d): %s" % (self.num, i, reply)
time.sleep(0.05)
# _lock.release()
i = i + 1
@@ -92,7 +94,7 @@
i = 100
while i > 0:
- t = TestClient(certs)
+ t = TestClient(certs, i)
print "Created thread %d." % i
t.start()
i = i - 1
18 years
web/html/Contribute index.php,1.1,1.2
by fedora-extras-commits@redhat.com
Author: nman64
Update of /cvs/fedora/web/html/Contribute
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17584/html/Contribute
Modified Files:
index.php
Log Message:
First round of edits to new revamp
Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/Contribute/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php 29 Nov 2005 17:32:30 -0000 1.1
+++ index.php 1 Dec 2005 01:18:35 -0000 1.2
@@ -15,7 +15,7 @@
</p>
<p>
- Hundreds of individuals worldwide contribute directly to the success of Fedora projects. Contributing to the community is the best way of learning about the community. Fedora sponsors a number of community projects, which provide participation opportunities for people of all backgrounds.
+ Hundreds of individuals worldwide contribute directly to the success of the Fedora Project. Contributing is the best way of learning about the community. The Fedora Project is made up of a number of community projects, which provide participation opportunities for people of all backgrounds.
</p>
<h2>Fedora Extras Project</h2>
@@ -36,7 +36,7 @@
<p>
To read more about how to contribute to Fedora Documentation, visit the
- <a href="http://fedoraproject.org/About/Projects/docs.php">Fedora Documentation Project</a> page.
+ <a href="/About/Projects/docs.php">Fedora Documentation Project</a> page.
</p>
<h2>Fedora Translation Project</h2>
@@ -59,9 +59,15 @@
<p>
To read more about how to become a Fedora Ambassador, please visit the
- <a href="http://fedoraproject.org/wiki/Ambassadors/">Fedora Ambassadors Project</a> wiki.
+ <a href="http://fedoraproject.org/wiki/Ambassadors">Fedora Ambassadors Project</a> wiki.
</p>
+
+<h2>Other Projects</h2>
+
+<p>
+ For information on other Fedora projects, see the <a href="http://fedoraproject.org/wiki/Projects">Projects</a> wiki page.
+</p>
<?
$template->displayFooter('$Date$');
18 years
web/html/About/Projects docs.php,1.1,1.2
by fedora-extras-commits@redhat.com
Author: nman64
Update of /cvs/fedora/web/html/About/Projects
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17584/html/About/Projects
Modified Files:
docs.php
Log Message:
First round of edits to new revamp
Index: docs.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/docs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docs.php 29 Nov 2005 17:30:30 -0000 1.1
+++ docs.php 1 Dec 2005 01:18:28 -0000 1.2
@@ -34,11 +34,11 @@
writers can contribute documentation about a specific topic
without having to worry about how it fits into a manual or how
it flows with other topics. Since the documents are for the
- $PROJECT_NAME;, they only need to describe how to perform
+ $PROJECT_NAME, they only need to describe how to perform
tasks on $RELEASE_NAME.</p>
<p> The project maintains some useful pages on the <a
- href=\"http://fedoraproject.org/wiki\">Fedora Project
+ href=\"http://fedoraproject.org/wiki/\">Fedora Project
Wiki</a>:</p>
<ul>
@@ -51,7 +51,7 @@
<!-- <li><a href=\"\"></a></li> -->
<!-- <li><a href=\"\"></a></li> -->
<li><a href=\"http://fedoraproject.org/wiki/DocsProject/CvsUsage\">CVS Usage Guidelines</a></li>
-<li><a href=\"http://fedoraproject.org/wiki/DocsProject_2fDocumentationGuide\">Doc Guide Wiki Page</a> for tracking ideas during update cycles to the FDP Documentation Guide</li>
+<li><a href=\"http://fedoraproject.org/wiki/DocsProject/DocumentationGuide\">Doc Guide Wiki Page</a> for tracking ideas during update cycles to the FDP Documentation Guide</li>
<li><a href=\"http://fedoraproject.org/wiki/DocsProject/SteeringCommittee\">Fedora Documentation Steering Committee</a>, FDSCo for short, aka \"Eff-Disco\"</li>
</ul>
<p>
18 years