summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #143 from fennm/proxy-retry-on-ssl-errorChris St. Pierre2013-11-051-1/+0
|\ | | | | Proxy: Catch SSL errors and retry
| * Don't re-raise unknown exceptions per stpierreMichael Fenn2013-11-021-4/+0
| |
| * Proxy: Catch SSL errors and retryMichael Fenn2013-11-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SSL library can throw an exception during the XMLRPC method call. There is no explicit except statement for this type of exception so they get raised up and abort the client's processing. This patch catches the exception so that normal retry processing occurs. Typical traceback: Traceback (most recent call last): File "/usr/sbin/bcfg2", line 29, in ? sys.exit(main()) File "/usr/sbin/bcfg2", line 26, in main return Client(setup).run() File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 256, in run rawconfig = self.get_config(times=times).decode('utf-8') File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 225, in get_config self.run_probes(times=times) File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 151, in run_probes probes = Bcfg2.Client.XML.XML(str(self.proxy.GetProbes())) File "/usr/lib/python2.4/site-packages/Bcfg2/Proxy.py", line 81, in __call__ return _orig_Method.__call__(self, *args) File "/usr/lib64/python2.4/xmlrpclib.py", line 1096, in __call__ return self.__send(self.__name, args) File "/usr/lib64/python2.4/xmlrpclib.py", line 1383, in __request verbose=self.__verbose File "/usr/lib/python2.4/site-packages/Bcfg2/Proxy.py", line 331, in request return self.parse_response(response) File "/usr/lib64/python2.4/xmlrpclib.py", line 1255, in parse_response return self._parse_response(file, None) File "/usr/lib64/python2.4/xmlrpclib.py", line 1276, in _parse_response response = file.read(1024) File "/usr/lib64/python2.4/httplib.py", line 480, in read s = self.fp.read(amt) File "/usr/lib64/python2.4/socket.py", line 303, in read data = self._sock.recv(recv_size) File "/usr/lib64/python2.4/site-packages/M2Crypto/SSL/Connection.py", line 217, in read return self._read_bio(size) File "/usr/lib64/python2.4/site-packages/M2Crypto/SSL/Connection.py", line 202, in _read_bio return m2.ssl_read(self.ssl, size, self._timeout) M2Crypto.SSL.SSLError: (104, 'Connection reset by peer')
* | Admin: Don't call dead Mode.__call__ codeMichael Fenn2013-11-052-2/+0
|/ | | | | | | | | In 9eb3db84, Bcfg2.Server.Admin.Mode.__call__() was changed from pass to raise a NotImplementedError. This causes bcfg2-admin compare and bcfg2-admin snapshots to fail because they call Bcfg2.Server.Admin.Mode.__call__() right away. Since that method didn't do anything anyway, it seems expediant to just avoid the call altogether.
* Revert "Reporting: Simple sanity check to avoid creating too many threads"Michael Fenn2013-10-141-3/+0
| | | | | | | | This reverts commit f813f86f8ac2bc7b55f4eb6a0d936f1ce4f68ba7. Premature optimization is the root of all evil, etc. Conflicts: src/lib/Bcfg2/Reporting/Collector.py
* Reporting: misc improvements to collector threadingMichael Fenn2013-10-101-4/+6
| | | | | | 1. Use a better convention for calling the threading.Thread constructor 2. Add docstring to ReportingStoreThread.run 3. Give the storage thread variable a better name
* Merge remote-tracking branch 'upstream/maint' into ↵Michael Fenn2013-10-103-5/+8
|\ | | | | | | reporting-thread-each-data-import
| * Packages: fixed metadata.Packages["sources"]Chris St. Pierre2013-10-091-1/+1
| |
| * Metadata: read in clients.xml on every writeChris St. Pierre2013-10-041-0/+1
| | | | | | | | | | | | | | | | | | This ensures consistency between the in-memory representation of clients.xml and the representation on disk. If we don't read our writes immediately, there's a race condition when creating a new client: If it asserts its profile or version before the FAM event from the clients.xml edit is processed, then the clients doesn't appear to exist yet, and Bcfg2 complains.
| * Metadata: import any() from CompatChris St. Pierre2013-10-031-1/+3
| |
| * Core: Fixed error message on failed altsrc bindChris St. Pierre2013-09-301-3/+3
| |
* | Reporting: Simple sanity check to avoid creating too many threadsMichael Fenn2013-10-091-0/+3
| |
* | Reporting: start a new thread for each importMichael Fenn2013-10-091-10/+29
|/ | | | | | | | | | | | | | | | | When dealing with a high-latency database connection (eg. across a WAN), the bcfg2-report-collector process can fall behind in its import queue. The imports are very much bound by the response latency of the database server and not processing throughput. This patch fires off a new thread for each database interaction. The thread itself simply falls out of scope when the interaction is finished processing. The interaction object is still read from the disk serially in order avoid having to create a locking mechanism for that part of the process. This change does potentially create greater load on the database server, but ultimately the load is limited by rate at which the bcfg2 server can generate work.
* GroupLogic: fixed thread-local variable initializationChris St. Pierre2013-09-271-11/+13
|
* AWSTags: fixed cache clearing at start of client runChris St. Pierre2013-09-261-1/+1
|
* models: handle failure to import plugin gracefullyChris St. Pierre2013-09-261-1/+1
|
* Metadata: better logging when updating XML data failsChris St. Pierre2013-09-261-5/+6
|
* New plugin: AWSTagsChris St. Pierre2013-09-262-0/+218
| | | | | AWSTags allows querying tags from EC2, and setting groups based on the tag names or values.
* GroupLogic: avoid infinite recursion when using metadata.query in GroupLogicChris St. Pierre2013-09-231-0/+17
|
* GroupLogic: sort after other plugins so GroupLogic can use, e.g., Probe groupsChris St. Pierre2013-09-231-0/+3
|
* bcfg2-lint: Fixed Metadata check for duplicate groupsChris St. Pierre2013-09-171-9/+29
| | | | | | | | | The duplicate group check parsed groups differently from the actual groups.xml parsing routines; the latter followed the documentation, while the duplicate group check did now. This fixes the duplicate group check to parse groups.xml correctly when looking for duplicates. Fixes #140
* CfgPublicKeyCreator: properly handle case where only private key has been ↵Chris St. Pierre2013-09-162-25/+44
| | | | | | | | | created Previously, only two cases were handled properly: both public and private keys had been created; or neither had been created. If the private key had been created (e.g., manually added to the repo), the public key would not be created from it. This fixes that.
* Remove all ACLs (including mask) from entries with no ACLs listedChris St. Pierre2013-09-121-0/+5
| | | | | | When installing an entry with no ACLs specified, but with ACLs on the file as it exists on the filesystem, the ACL mask was preserved, even as the ACLs are deleted.
* XMLFileBacked: removed unused variableChris St. Pierre2013-09-111-1/+1
|
* XMLFileBacked: Fixed multiple identical XIncludes in one fileChris St. Pierre2013-09-111-12/+9
|
* bcfg2-lint: Added Cfg check for multiple global handlers for one entry setChris St. Pierre2013-09-091-1/+17
|
* Cfg: allow changing category specific-ness of generated authorized_keysChris St. Pierre2013-09-091-3/+3
|
* Cfg: Give non-specific handlers a default specificityChris St. Pierre2013-09-091-0/+2
|
* POSIXUsers: Fix tracebackSol Jerome2013-09-061-1/+2
| | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* Core: avoid importing Metadata before Django has been configuredChris St. Pierre2013-09-051-2/+1
|
* Allow Connector to create new groupsChris St. Pierre2013-09-053-5/+66
| | | | | Connector plugins can now create new groups, including the full range of options on those groups (profile, public, category, etc.).
* Cfg: More flexible and complete way to specify authorized keys optionsChris St. Pierre2013-09-041-4/+13
|
* XMLFileBacked: Monitor XIncludes whenever a FAM is availableChris St. Pierre2013-09-042-7/+9
| | | | | | | | | | This monitors XIncluded files even if should_monitor=False, since the object monitoring the base file will not monitor XIncludes. This ensures that XIncluded files are properly monitored whenever possible, particularly for Bundler and Properties. This is a partial backport of 5b66845 -- as much of a backport as is possible without a module-level FAM object.
* Merge pull request #139 from ↵Chris St. Pierre2013-09-031-2/+4
|\ | | | | | | | | kincl/pre-action-processing-with-independent-entries Pre action processing with independent entries
| * Fix pep8 errorsJason Kincl2013-08-301-3/+3
| |
| * Client: Add entries processed as important to list of entries whenJason Kincl2013-08-301-2/+4
| | | | | | | | determining if a bundle has been modified
* | SSLServer: Decode chunk for python 3Sol Jerome2013-09-011-1/+1
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | NagiosGen: Fix overindentSol Jerome2013-09-011-3/+3
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | NagiosGen: Fix pylint failureSol Jerome2013-09-011-2/+2
|/ | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* Revert "Rules: fixed HandlesEntry for XMLSrc replacement"Chris St. Pierre2013-08-291-4/+3
| | | | | | This reverts commit 542ededa8297b1889542d97b9bdfb8345dd7550c. Committed to wrong branch.
* Rules: fixed HandlesEntry for XMLSrc replacementChris St. Pierre2013-08-291-3/+4
| | | | | | This makes HandlesEntry work with the new code that's in place for StructFile to replace XMLSrc. Fixes https://github.com/Bcfg2/bcfg2/commit/2169edc1bba82076db776b75db89b79d6f2f4786#commitcomment-3968162
* SSLServer: close connections properlyChris St. Pierre2013-08-291-8/+5
|
* SSLServer: Removed decode_request_content callChris St. Pierre2013-08-291-2/+0
| | | | | | | decode_request_content() just adds support for gzipped content, which the Bcfg2 client doesn't support. Given that this feature was only added in Python 2.7, it's unlikely we'll be adding support for gzipped POST content any time soon.
* Metadata: get_client_names_by_* fixesChris St. Pierre2013-08-291-5/+13
| | | | | | Fixed long lines. Improved efficiency by avoiding multiple loops over the same data.
* SSLServer: Poll for POST data correctlyChris St. Pierre2013-08-282-12/+10
| | | | | | | | This updates the do_POST() code to cleave more closely to the code in SimpleXMLRPCHandler.do_POST (plus SSL magic, of course). In doing so, it eliminates a select() call whose timeouts were not handled properly, and which thus left stray idle processes around after incomplete XML-RPC calls.
* Metadata: Fix client list calls use list_clients() which is DB-aware instead ↵Jason Kincl2013-08-271-5/+5
| | | | of just self.clients
* SELinux: Update the matchpathcon function to use the file's modeJonathan Billings2013-08-221-1/+2
| | | | | | | | If you don't supply a mode to the selinux.matchpathcon() function, it fails to properly look up the context in some circumstances related to context patterns in the SELinux policy. This change looks up the mode and supplies it to the function. (cherry picked from commit 20a2c9a8fb6c6ecbed259b5deccb01c01bf3304f)
* Reporting: have bcfg2-report-collector be explicit about detachingMichael Fenn2013-08-191-1/+1
| | | | | | | | | Following the same logic as 360ba2e7, we should be explicit about the need to detach the bcfg2-report-collector process. Side note: this bit me because I was starting the bcfg2 server processes via SSH, and the way python-daemon checks for being started by inetd is to see if stdin is a socket. (??)
* Metadata: removed stray blank lineChris St. Pierre2013-08-151-1/+0
|
* Metadata: search groups breadth-first when building metadataChris St. Pierre2013-08-151-25/+37
| | | | | This makes category negation consistent, and also makes it work like it did in Bcfg2 1.2
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 10:33:17 +0000