summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Chris St. Pierre2013-11-115-34/+53
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/Bcfg2/Server/Admin/Compare.py src/lib/Bcfg2/Server/Admin/Snapshots.py src/lib/Bcfg2/Server/MultiprocessingCore.py src/lib/Bcfg2/Server/Plugins/Probes.py src/sbin/bcfg2-crypt src/sbin/bcfg2-reports tools/upgrade/1.3/migrate_configs.py tools/upgrade/1.3/migrate_perms_to_mode.py
| * bcfg2-crypt: fixed missing EVPErrorChris St. Pierre2013-11-111-2/+1
| |
| * bcfg2-crypt: better debugging, error handling with Properties filesChris St. Pierre2013-11-111-3/+37
| |
| * bcfg2-crypt: fixed completely backwards logicChris St. Pierre2013-11-111-1/+1
| |
| * Probes: automatically remove duplicate probe dataChris St. Pierre2013-11-111-3/+10
| |
| * Version bump to 1.3.3v1.3.3Sol Jerome2013-11-072-2/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Multiprocessing: removed unused importChris St. Pierre2013-11-061-1/+1
| |
| * bcfg2-crypt: fixed deprecation warningChris St. Pierre2013-11-051-1/+1
| |
| * Multiprocessing: don't reuse child RPC listenersChris St. Pierre2013-11-051-26/+7
| |
| * Merge pull request #110 from AlexanderS/reporting-model-updatesChris St. Pierre2013-11-051-5/+5
| |\ | | | | | | bcfg2-reports: update to use current models
| | * bcfg2-reports: update to use current modelsAlexander Sulfrian2013-06-291-5/+5
| | |
| * | 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.
* | | bcfg2-lint: better checks for TemplateHelper __default__ stuffChris St. Pierre2013-11-111-1/+15
| | | | | | | | | | | | | | | | | | | | | * Check to ensure that no symbols use reserved words, which are different for __default__ than for __export__ * Check to ensure that symbols aren't listed in both __default__ and __export__
* | | TemplateHelper: misc. cleanup of __default__ featureChris St. Pierre2013-11-111-14/+20
| | | | | | | | | | | | | | | | | | * Don't require symbols to be listed twice; they can be listed in either __export__ or __default__, but need not be in both. * Check for reserved words in __default__ list
* | | Reporting: fixed error reportingChris St. Pierre2013-10-311-1/+1
| | |
* | | bcfg2-report-collector: import DBSettings explicitly to parse them earlyChris St. Pierre2013-10-311-0/+1
| | |
* | | Options: Don't reparse initial config fileChris St. Pierre2013-10-311-3/+5
| | | | | | | | | | | | It hasn't been parsed at this stage anyway.
* | | Info: Make ^C interaction look nicerSol Jerome2013-10-301-1/+1
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | | bcfg2-reports: rewrote with new option parserChris St. Pierre2013-10-303-278/+280
| | |
* | | Core: Avoid unnecessarily reparsing config file on startupChris St. Pierre2013-10-301-1/+4
| | |
* | | fixed Core stringificationChris St. Pierre2013-10-301-2/+5
| | |
* | | DB: fixed how Django settings are loadedChris St. Pierre2013-10-3011-254/+244
| | |
* | | Core: Better stringification of server core objectsChris St. Pierre2013-10-302-0/+12
| | |
* | | Plugins: Added TemplateDataProvider plugin interfaceChris St. Pierre2013-10-306-42/+185
| | | | | | | | | | | | | | | | | | | | | This lets you provide variables to the top-level namespace of templates in a more seamless way than through a Connector plugin. It's mostly useful for TemplateHelper for now, but may find other uses in the future.
* | | Core: Make core object available at the module levelChris St. Pierre2013-10-292-3/+6
| | |
* | | Plugins: refactored out unnecessary datastore constructor argumentChris St. Pierre2013-10-2936-88/+84
| | |
* | | testsuite: more test fixesChris St. Pierre2013-10-281-5/+1
| | |
* | | fixed misc. unit testsChris St. Pierre2013-10-283-6/+7
| | |
* | | Merge branch 'maint'Chris St. Pierre2013-10-288-28/+275
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/development/lint.txt misc/bcfg2.spec src/lib/Bcfg2/Reporting/Collector.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/Plugins/Metadata.py src/lib/Bcfg2/Server/models.py testsuite/install.sh
| * | 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.
* | | bcfg2-lint: allow specifying no lint pluginsChris St. Pierre2013-10-091-1/+1
| | |
* | | SSHbase: Fix print statement for python 3Sol Jerome2013-10-071-1/+1
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | | SSHbase: support encryption of generated ssh keysChris St. Pierre2013-10-071-5/+66
| | |
* | | Probes: set _use_db property correctlyChris St. Pierre2013-09-231-1/+4
| | |