vdsm-patches November 2012

vdsm-patches@lists.fedorahosted.org

50 participants
416 discussions

Change in vdsm[master]: Add license
by Pablo Iranzo Gómez 26 Nov '12

26 Nov '12

Pablo Iranzo Gómez has uploaded a new change for review. Change subject: Add license ...................................................................... Add license Change-Id: Ib439e74f0010ca9921351421cabdf286e8fa21f5 Signed-off-by: Pablo <Pablo.Iranzo(a)gmail.com> --- A contrib/forceVMstart/COPYING.GPLv2 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/75/9475/1 diff --git a/contrib/forceVMstart/COPYING.GPLv2 b/contrib/forceVMstart/COPYING.GPLv2 new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/contrib/forceVMstart/COPYING.GPLv2 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. -- To view, visit http://gerrit.ovirt.org/9475 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib439e74f0010ca9921351421cabdf286e8fa21f5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Pablo Iranzo Gómez <Pablo.Iranzo(a)redhat.com>

2 4

Change in vdsm[master]: File rename to fulfill naming convention
by Pablo Iranzo Gómez 26 Nov '12

26 Nov '12

Pablo Iranzo Gómez has uploaded a new change for review. Change subject: File rename to fulfill naming convention ...................................................................... File rename to fulfill naming convention Change-Id: Ieab5da7cebc6724088689dd30aaa1a9977db1459 Signed-off-by: Pablo <Pablo.Iranzo(a)gmail.com> --- R contrib/forceVMstart/forceVMstart.py 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/9474/1 diff --git a/contrib/forceVMstart/vdsEmergency-1.0.0.py b/contrib/forceVMstart/forceVMstart.py similarity index 100% rename from contrib/forceVMstart/vdsEmergency-1.0.0.py rename to contrib/forceVMstart/forceVMstart.py -- To view, visit http://gerrit.ovirt.org/9474 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieab5da7cebc6724088689dd30aaa1a9977db1459 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Pablo Iranzo Gómez <Pablo.Iranzo(a)redhat.com>

2 4

Change in vdsm[master]: Remove REST bindings
by Dan Kenigsberg 26 Nov '12

26 Nov '12

Dan Kenigsberg has submitted this change and it was merged. Change subject: Remove REST bindings ...................................................................... Remove REST bindings No one uses them and no one should. We are going in a different direction for a supported API and keeping the rest bindings alive is confusing and cumbersome. Change-Id: I6c2a2909323e943e076db8443ce84f839eab874c Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M Makefile.am M configure.ac M tests/Makefile.am M tests/functional/Makefile.am D tests/functional/restTests.py D tests/restData.py D tests/restTests.py M vdsm.spec.in M vdsm/Makefile.am M vdsm/clientIF.py M vdsm/config.py.in D vdsm/rest/BindingREST.py D vdsm/rest/Controller.py D vdsm/rest/Dispatcher.py D vdsm/rest/Makefile.am D vdsm/rest/__init__.py D vdsm/rest/templates/Makefile.am D vdsm/rest/templates/api.xsd D vdsm/rest/templates/image.json.x D vdsm/rest/templates/image.xml.x D vdsm/rest/templates/images.json.x D vdsm/rest/templates/images.xml.x D vdsm/rest/templates/response.json.x D vdsm/rest/templates/response.xml.x D vdsm/rest/templates/root.json.x D vdsm/rest/templates/root.xml.x D vdsm/rest/templates/rsdl.xml D vdsm/rest/templates/storageconnectionref.json.x D vdsm/rest/templates/storageconnectionref.xml.x D vdsm/rest/templates/storageconnectionrefs.json.x D vdsm/rest/templates/storageconnectionrefs.xml.x D vdsm/rest/templates/storagedomain.json.x D vdsm/rest/templates/storagedomain.xml.x D vdsm/rest/templates/storagedomains.json.x D vdsm/rest/templates/storagedomains.xml.x D vdsm/rest/templates/storagepool.json.x D vdsm/rest/templates/storagepool.xml.x D vdsm/rest/templates/storagepools.json.x D vdsm/rest/templates/storagepools.xml.x D vdsm/rest/templates/task.json.x D vdsm/rest/templates/task.xml.x D vdsm/rest/templates/tasks.json.x D vdsm/rest/templates/tasks.xml.x D vdsm/rest/templates/volume.json.x D vdsm/rest/templates/volume.xml.x D vdsm/rest/templates/volumes.json.x D vdsm/rest/templates/volumes.xml.x 47 files changed, 3 insertions(+), 4,195 deletions(-) Approvals: Adam Litke: Looks good to me, but someone else must approve Dan Kenigsberg: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7754 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c2a2909323e943e076db8443ce84f839eab874c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: Remove REST bindings
by Dan Kenigsberg 26 Nov '12

26 Nov '12

Dan Kenigsberg has posted comments on this change. Change subject: Remove REST bindings ...................................................................... Patch Set 2: Verified; Looks good to me, approved alas, farewell. -- To view, visit http://gerrit.ovirt.org/7754 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c2a2909323e943e076db8443ce84f839eab874c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: Remove REST bindings
by agl＠us.ibm.com 26 Nov '12

26 Nov '12

Adam Litke has posted comments on this change. Change subject: Remove REST bindings ...................................................................... Patch Set 2: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/7754 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c2a2909323e943e076db8443ce84f839eab874c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: mom: Report the status of the mom threads
by agl＠us.ibm.com 26 Nov '12

26 Nov '12

Adam Litke has uploaded a new change for review. Change subject: mom: Report the status of the mom threads ...................................................................... mom: Report the status of the mom threads It will be useful to check on the status of the MOM threads. Add a new field to the HostStats structure to provide this information. Change-Id: Ibd36a5c3a91abfa3fa29c811ce9b3586bf0bda36 Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- M vdsm/API.py M vdsm/momIF.py M vdsm_api/vdsmapi-schema.json 3 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/9287/1 diff --git a/vdsm/API.py b/vdsm/API.py index 202afc8..cb1f4cc 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1120,8 +1120,10 @@ stats['dateTime'] = '%02d-%02d-%02dT%02d:%02d:%02d GMT' % ( tm_year, tm_mon, tm_day, tm_hour, tm_min, tm_sec) if self._cif.mom: + stats['momStatus'] = self._cif.mom.getStatus() stats.update(self._cif.mom.getKsmStats()) else: + stats['momStatus'] = 'disabled' stats['ksmState'] = self._cif.ksmMonitor.state stats['ksmPages'] = self._cif.ksmMonitor.pages stats['ksmCpu'] = self._cif.ksmMonitor.cpuUsage diff --git a/vdsm/momIF.py b/vdsm/momIF.py index 827e9e4..cbe94d0 100644 --- a/vdsm/momIF.py +++ b/vdsm/momIF.py @@ -55,3 +55,9 @@ if self._mom is not None: self.log.info("Shutting down MOM") self._mom.shutdown() + + def getStatus(self): + if self.isAlive(): + return 'active' + else: + return 'stopped' diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 6591410..149bfef 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -1420,6 +1420,22 @@ 'key': 'str', 'value': 'PathStats'} ## +# @MOMStatus: +# +# An enumeration of possible MOM statuses. +# +# @disabled: MOM is not enabled on this host +# +# @active: MOM is enabled and running +# +# @stopped: MOM has terminated +# +# Since: 4.10.1 +## +{'enum': 'MOMStatus', 'data': ['disabled', 'active', 'stopped']} + + +## # @HostStats: # # Statistics about this host. @@ -1490,6 +1506,8 @@ # # @generationID: A @UUID that is refreshed each time vdsm starts # +# @momStatus: The current status of the MOM policy engine +# # Since: 4.10.0 ## {'type': 'HostStats', @@ -1506,7 +1524,8 @@ 'swapTotal': 'int', 'swapFree': 'int','vmCount': 'int', 'vmActive': 'int', 'vmMigrating': 'int', 'dateTime': 'str', 'ksmState': 'bool', 'ksmPages': 'int', 'ksmCpu': 'float', - 'netConfigDirty': 'bool', 'generationID': 'UUID'} + 'netConfigDirty': 'bool', 'generationID': 'UUID', + 'momStatus': 'MOMStatus'} ## # @Host.getStats: -- To view, visit http://gerrit.ovirt.org/9287 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd36a5c3a91abfa3fa29c811ce9b3586bf0bda36 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>

7 17

Change in vdsm[master]: spec: Add MOM as a package dependency
by agl＠us.ibm.com 26 Nov '12

26 Nov '12

Adam Litke has uploaded a new change for review. Change subject: spec: Add MOM as a package dependency ...................................................................... spec: Add MOM as a package dependency For oVirt 3.2, we are switching to MOM for KSM tuning. One of the goals of this release is to ensure that MOM is running in all deployed oVirt hosts (ovirt-node and standalone). A recent enough version of MOM is now available upstream for Fedora and RHEL and we build nightly RPMs on ovirt.org. I think we are ready to add this packaging dependency now. Change-Id: I8e8c5a67066f270b8f19881ac5871ff844dbecaa Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/9272/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 20ad1dc..2fb7254 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -120,6 +120,7 @@ Requires: libselinux-python Requires: %{name}-python = %{version}-%{release} Requires: pyparted +Requires: mom <= 0.3.0 Requires(pre,preun): policycoreutils-python Requires(post): /usr/sbin/saslpasswd2 -- To view, visit http://gerrit.ovirt.org/9272 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e8c5a67066f270b8f19881ac5871ff844dbecaa Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>

5 18

Change in vdsm[master]: pep8: fix libvirtconnection.py
by Dan Kenigsberg 26 Nov '12

26 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: pep8: fix libvirtconnection.py ...................................................................... pep8: fix libvirtconnection.py Change-Id: Ie6fef13e80b2330dbc65c3440ceb994c5c6903b5 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M Makefile.am M vdsm/libvirtconnection.py 2 files changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/9437/1 diff --git a/Makefile.am b/Makefile.am index 26ce402..a234428 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,6 +67,7 @@ vdsm/hooks.py \ vdsm/kaxmlrpclib.py \ vdsm/ksm.py \ + vdsm/libvirtconnection.py \ vdsm/libvirtev.py \ vdsm/libvirtvm.py \ vdsm/lsblk.py \ diff --git a/vdsm/libvirtconnection.py b/vdsm/libvirtconnection.py index 41ba933..faf0cd0 100644 --- a/vdsm/libvirtconnection.py +++ b/vdsm/libvirtconnection.py @@ -30,6 +30,7 @@ # TODO: make this internal to libvirtev, and make the thread stoppable libvirtev.virEventLoopPureStart() + def __eventCallback(conn, dom, *args): try: cif, eventid = args[-1] @@ -38,7 +39,7 @@ if not v: cif.log.debug('unknown vm %s eventid %s args %s', vmid, eventid, - args) + args) return if eventid == libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE: @@ -74,6 +75,8 @@ __connections = {} __connectionLock = threading.Lock() + + def get(cif=None): """Return current connection to libvirt or open a new one. @@ -91,8 +94,9 @@ setattr(ret, name, wrapMethod(method)) return ret except libvirt.libvirtError, e: - if (e.get_error_domain() in (libvirt.VIR_FROM_REMOTE, libvirt.VIR_FROM_RPC) - and e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR): + if (e.get_error_domain() in (libvirt.VIR_FROM_REMOTE, + libvirt.VIR_FROM_RPC) and + e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR): cif.log.error('connection to libvirt broken. ' 'taking vdsm down.') cif.prepareForShutdown() @@ -102,14 +106,16 @@ return wrapper def req(credentials, user_data): + passwd = file(constants.P_VDSM_LIBVIRT_PASSWD).readline().rstrip("\n") for cred in credentials: if cred[0] == libvirt.VIR_CRED_AUTHNAME: cred[4] = constants.SASL_USERNAME elif cred[0] == libvirt.VIR_CRED_PASSPHRASE: - cred[4] = file(constants.P_VDSM_LIBVIRT_PASSWD).readline().rstrip("\n") + cred[4] = passwd return 0 - auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_PASSPHRASE], req, None] + auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_PASSPHRASE], + req, None] with __connectionLock: conn = __connections.get(id(cif)) @@ -118,7 +124,7 @@ 'qemu:///system', auth, 0) conn = utils.retry(libvirtOpenAuth, timeout=10, sleep=0.2) __connections[id(cif)] = conn - if cif != None: + if cif is not None: for ev in (libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE, libvirt.VIR_DOMAIN_EVENT_ID_REBOOT, libvirt.VIR_DOMAIN_EVENT_ID_RTC_CHANGE, -- To view, visit http://gerrit.ovirt.org/9437 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6fef13e80b2330dbc65c3440ceb994c5c6903b5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 10

Change in vdsm[master]: pep8: have a space after all operators, not before colon
by Dan Kenigsberg 26 Nov '12

26 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: pep8: have a space after all operators, not before colon ...................................................................... pep8: have a space after all operators, not before colon Change-Id: I24a0b990395242dff75ed72b42dce944060e0b26 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vds_bootstrap/vds_bootstrap.py M vds_bootstrap/vds_bootstrap_complete.py M vdsm/dumpStorageTable.py.in M vdsm/sos/vdsm.py.in M vdsm/storage/blockSD.py M vdsm/storage/image.py M vdsm/storage/iscsi.py M vdsm/storage/resourceManager.py M vdsm/storage/sp.py M vdsm/storage/storage_mailbox.py M vdsm/storage/threadPool.py M vdsm_reg/deployUtil.py.in M vdsm_reg/engine.py.in 13 files changed, 131 insertions(+), 131 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/9436/1 diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py index 867d6f4..502fb2f 100755 --- a/vds_bootstrap/vds_bootstrap.py +++ b/vds_bootstrap/vds_bootstrap.py @@ -149,7 +149,7 @@ MINIMAL_SUPPORTED_PLATFORM = "5.5" # Required packages -REQ_PACK = ('SDL.x86_64','bridge-utils.x86_64','mesa-libGLU.x86_64', +REQ_PACK = ('SDL.x86_64', 'bridge-utils.x86_64', 'mesa-libGLU.x86_64', 'openssl.x86_64', 'rsync.x86_64') if rhel6based: @@ -163,9 +163,9 @@ 'glusterfs-geo-replication') else: # Devel packages - DEVEL_PACK = ('gdb','tcpdump','strace','ltrace','sysstat','ntp', - 'pstack','vim-common','vim-enhanced', - 'systemtap','systemtap-runtime') + DEVEL_PACK = ('gdb', 'tcpdump', 'strace', 'ltrace', 'sysstat', 'ntp', + 'pstack', 'vim-common', 'vim-enhanced', + 'systemtap', 'systemtap-runtime') # VDS packages VDS_PACK = ('kvm', 'kmod-kvm', 'kvm-tools', VDSM_NAME, VDSM_NAME+'-cli', 'qcairo', 'qffmpeg-libs', 'qspice-libs', 'qpixman', 'log4cpp', @@ -494,7 +494,7 @@ self.req_pack.append(pack) for p in self.req_pack: - logging.debug('>>> %s should be installed',p) + logging.debug('>>> %s should be installed', p) logging.debug('Check VDS packages ...') for pack in VDS_PACK: self.res, self.message = deployUtil.getPackageInfo("VDS", pack, 'status') @@ -503,7 +503,7 @@ self.vds_pack.append(pack) for p in self.vds_pack: - logging.debug('>>> %s should be installed',p) + logging.debug('>>> %s should be installed', p) logging.debug('Check development packages ...') for pack in DEVEL_PACK: self.res, self.message = deployUtil.getPackageInfo("DEVEL", pack, 'status') @@ -512,11 +512,11 @@ self.devel_pack.append(pack) for p in self.devel_pack: - logging.debug('>>> %s should be installed',p) + logging.debug('>>> %s should be installed', p) def _installPackage(self, pack, type, update=0): nReturn = 0 - logging.debug('Installing %s %d',pack, update ) + logging.debug('Installing %s %d', pack, update ) if type == "REQ" or type == "DEVEL": self.res, self.message = deployUtil.installAndVerify(type, pack, "install") res = "OK" @@ -578,7 +578,7 @@ # install/update packages while self.req_pack: logging.debug('Install required packages ...') - self.rc = self._installPackage(self.req_pack.pop(),"REQ") + self.rc = self._installPackage(self.req_pack.pop(), "REQ") if self.rc: return @@ -587,17 +587,17 @@ logging.debug('Update VDS packages ... %s', self.vds_pack.__repr__()) for pack in VDS_PACK: if pack not in self.vds_pack: - self.rc = self._installPackage(pack,"VDS", 1) + self.rc = self._installPackage(pack, "VDS", 1) if self.rc: return while self.vds_pack: - self.rc = self._installPackage(self.vds_pack.pop(),"VDS") + self.rc = self._installPackage(self.vds_pack.pop(), "VDS") if self.rc: return while self.devel_pack: logging.debug('Install development packages ...') - self._installPackage(self.devel_pack.pop(),"DEVEL") + self._installPackage(self.devel_pack.pop(), "DEVEL") def packagesExplorer(self): """ @@ -1064,7 +1064,7 @@ installGlusterService = False bridgeName = None opts, args = getopt.getopt(sys.argv[1:], "v:r:O:t:f:S:n:u:B:Vg") - for o,v in opts: + for o, v in opts: if o == "-v": deployUtil.setBootstrapInterfaceVersion(int(v)) if o == "-r": diff --git a/vds_bootstrap/vds_bootstrap_complete.py b/vds_bootstrap/vds_bootstrap_complete.py index 7711d82..eadf74c 100755 --- a/vds_bootstrap/vds_bootstrap_complete.py +++ b/vds_bootstrap/vds_bootstrap_complete.py @@ -72,7 +72,7 @@ installVirtualizationService = True installGlusterService = False opts, args = getopt.getopt(sys.argv[1:], "v:c:Vg") - for o,v in opts: + for o, v in opts: if o == "-v": deployUtil.setBootstrapInterfaceVersion(int(v)) if o == "-c": diff --git a/vdsm/dumpStorageTable.py.in b/vdsm/dumpStorageTable.py.in index ea42ab0..d173e6e 100644 --- a/vdsm/dumpStorageTable.py.in +++ b/vdsm/dumpStorageTable.py.in @@ -48,17 +48,17 @@ if len(cont) < 2: continue - self.vmList[vmUUID] = {'Name':vmName, 'Refs': []} + self.vmList[vmUUID] = {'Name': vmName, 'Refs': []} for x in range(1, len(cont)): image = cont[x].split(' ')[0].split('/')[0] if not image in images: - sd = self.serverConncetion.getImageDomainsList(pool,image)['domainslist'] + sd = self.serverConncetion.getImageDomainsList(pool, image)['domainslist'] if len(sd) > 0: sd = sd[0] images.append(image) self._setSdInfo(sd) - disks.append([sd,image]) - self.vmList[vmUUID]['Refs'].append([sd,image]) + disks.append([sd, image]) + self.vmList[vmUUID]['Refs'].append([sd, image]) self._getImages(disks) @@ -66,7 +66,7 @@ if not sd in self.domainsList.keys(): sd_info = self.serverConncetion.getStorageDomainInfo(sd)['info'] - self.domainsList[sd] = {'Name':sd_info['name'], 'Role':sd_info['role'], 'Refs':[]} + self.domainsList[sd] = {'Name': sd_info['name'], 'Role': sd_info['role'], 'Refs': []} def _getSds(self, pool): @@ -109,7 +109,7 @@ for vol in volumes['uuidlist']: res = self.serverConncetion.getVolumeInfo(sd, pool, image, vol) volParents[vol] = res['info']['parent'] - imageDomVol = '%s:%s:%s' % (sd, image,vol) + imageDomVol = '%s:%s:%s' % (sd, image, vol) self.volumesList[imageDomVol] = [] if res['info']['voltype'] == 'LEAF': @@ -119,7 +119,7 @@ leafvol = vol self.volumesList[imageDomVol].append('Template') - self.imagesList[imageDom] = self._buildVolumesChain(leafvol,vollen,volParents, sd, image) + self.imagesList[imageDom] = self._buildVolumesChain(leafvol, vollen, volParents, sd, image) def _buildVolumesChain(self, leafvol, vollen, volParents, sd, image): @@ -127,7 +127,7 @@ volChain[(vollen-1)]=leafvol next = leafvol - for k in range(1,(vollen+1)): + for k in range(1, (vollen+1)): prev = next next = volParents[prev] if next in volParents.keys(): @@ -138,7 +138,7 @@ else: app = '%s' % (next) - imageDomVol = '%s:%s:%s' % (sd, image,prev) + imageDomVol = '%s:%s:%s' % (sd, image, prev) templList = self.volumesList[imageDomVol] if len(templList) == 0: templList.append(app) diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in index 031e2a3..5f09f8d 100644 --- a/vdsm/sos/vdsm.py.in +++ b/vdsm/sos/vdsm.py.in @@ -45,7 +45,7 @@ optionList = [("logsize", 'max size (MiB) to collect per log file', '', False)] - def __addCopySpecLogLimit(self,path, logsize=None): + def __addCopySpecLogLimit(self, path, logsize=None): """ Glob the files in path and ensure that the sorted cumulative list of globbed files isn't larger than logsize in MiB if diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index ce45da7..bb98b60 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -108,10 +108,10 @@ # TBD: Do we really need this key? BLOCK_SD_MD_FIELDS.update({ # Key dec, enc - DMDK_PV_REGEX : (decodePVInfo, encodePVInfo), - DMDK_VGUUID : (str, str), - DMDK_LOGBLKSIZE : (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), str), - DMDK_PHYBLKSIZE : (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), str), + DMDK_PV_REGEX: (decodePVInfo, encodePVInfo), + DMDK_VGUUID: (str, str), + DMDK_LOGBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), str), + DMDK_PHYBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), str), }) INVALID_CHARS = re.compile(r"[^a-zA-Z0-9_+.\-/=!:#]") @@ -341,8 +341,8 @@ f.seek(self._offset) f.write(data) -LvBasedSDMetadata = lambda vg, lv : DictValidator(PersistentDict(LvMetadataRW(vg, lv, 0, SD_METADATA_SIZE)), BLOCK_SD_MD_FIELDS) -TagBasedSDMetadata = lambda vg : DictValidator(PersistentDict(VGTagMetadataRW(vg)), BLOCK_SD_MD_FIELDS) +LvBasedSDMetadata = lambda vg, lv: DictValidator(PersistentDict(LvMetadataRW(vg, lv, 0, SD_METADATA_SIZE)), BLOCK_SD_MD_FIELDS) +TagBasedSDMetadata = lambda vg: DictValidator(PersistentDict(VGTagMetadataRW(vg)), BLOCK_SD_MD_FIELDS) def selectMetadata(sdUUID): mdProvider = LvBasedSDMetadata(sdUUID, sd.METADATA) @@ -358,7 +358,7 @@ mdathreshold - False if the VG's metadata exceeded its threshold, else True mdavalid - False if the VG's metadata size too small, else True """ - mdaStatus = {'mdavalid':True, 'mdathreshold':True} + mdaStatus = {'mdavalid': True, 'mdathreshold': True} mda_size = int(vg.vg_mda_size) mda_free = int(vg.vg_mda_free) @@ -477,7 +477,7 @@ numOfPVs = len(lvm.listPVNames(vgName)) if version in VERS_METADATA_LV and numOfPVs > MAX_PVS: - cls.log.debug("%d > %d" , numOfPVs, MAX_PVS) + cls.log.debug("%d > %d", numOfPVs, MAX_PVS) raise se.StorageDomainIsMadeFromTooManyPVs() # Create metadata service volume @@ -528,21 +528,21 @@ # Do we really need to keep the VGUUID? # no one reads it from here anyway initialMetadata = { - sd.DMDK_VERSION : version, - sd.DMDK_SDUUID : sdUUID, - sd.DMDK_TYPE : storageType, - sd.DMDK_CLASS : domClass, - sd.DMDK_DESCRIPTION : domainName, - sd.DMDK_ROLE : sd.REGULAR_DOMAIN, - sd.DMDK_POOLS : [], - sd.DMDK_LOCK_POLICY : '', - sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC : sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], - sd.DMDK_LEASE_TIME_SEC : sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], - sd.DMDK_IO_OP_TIMEOUT_SEC : sd.DEFAULT_LEASE_PARAMS[sd.DMDK_IO_OP_TIMEOUT_SEC], - sd.DMDK_LEASE_RETRIES : sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LEASE_RETRIES], - DMDK_VGUUID : vgUUID, - DMDK_LOGBLKSIZE : logBlkSize, - DMDK_PHYBLKSIZE : phyBlkSize, + sd.DMDK_VERSION: version, + sd.DMDK_SDUUID: sdUUID, + sd.DMDK_TYPE: storageType, + sd.DMDK_CLASS: domClass, + sd.DMDK_DESCRIPTION: domainName, + sd.DMDK_ROLE: sd.REGULAR_DOMAIN, + sd.DMDK_POOLS: [], + sd.DMDK_LOCK_POLICY: '', + sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], + sd.DMDK_LEASE_TIME_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], + sd.DMDK_IO_OP_TIMEOUT_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_IO_OP_TIMEOUT_SEC], + sd.DMDK_LEASE_RETRIES: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LEASE_RETRIES], + DMDK_VGUUID: vgUUID, + DMDK_LOGBLKSIZE: logBlkSize, + DMDK_PHYBLKSIZE: phyBlkSize, } initialMetadata.update(mapping) @@ -711,7 +711,7 @@ return self.getFreeMetadataSlot(slotSize) def _getOccupiedMetadataSlots(self): - stripPrefix = lambda s, pfx : s[len(pfx):] + stripPrefix = lambda s, pfx: s[len(pfx):] occupiedSlots = [] for lv in lvm.getLV(self.sdUUID): if lv.name in SPECIAL_LVS: diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 0265dcc..a098489 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -48,9 +48,9 @@ SWAP_DISK_TYPE = 4 TEMP_DISK_TYPE = 5 -DISK_TYPES = {UNKNOWN_DISK_TYPE:'UNKNOWN', SYSTEM_DISK_TYPE:'SYSTEM', - DATA_DISK_TYPE:'DATA', SHARED_DISK_TYPE:'SHARED', - SWAP_DISK_TYPE:'SWAP', TEMP_DISK_TYPE:'TEMP'} +DISK_TYPES = {UNKNOWN_DISK_TYPE: 'UNKNOWN', SYSTEM_DISK_TYPE: 'SYSTEM', + DATA_DISK_TYPE: 'DATA', SHARED_DISK_TYPE: 'SHARED', + SWAP_DISK_TYPE: 'SWAP', TEMP_DISK_TYPE: 'TEMP'} # What volumes to synchronize SYNC_VOLUMES_ALL = 'ALL' @@ -61,7 +61,7 @@ UNKNOWN_OP = 0 COPY_OP = 1 MOVE_OP = 2 -OP_TYPES = {UNKNOWN_OP:'UNKNOWN', COPY_OP:'COPY', MOVE_OP:'MOVE'} +OP_TYPES = {UNKNOWN_OP: 'UNKNOWN', COPY_OP: 'COPY', MOVE_OP: 'MOVE'} RENAME_RANDOM_STRING_LEN = 8 @@ -562,7 +562,7 @@ # only base may have a different parent image pimg = imgUUID - return {'srcChain':srcChain, 'dstChain':dstChain} + return {'srcChain': srcChain, 'dstChain': dstChain} def _interImagesCopy(self, destDom, srcSdUUID, imgUUID, chains): srcLeafVol = chains['srcChain'][-1] diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index a0c3067..aaf1237 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -429,7 +429,7 @@ def getDefaultInitiatorName(): with open("/etc/iscsi/initiatorname.iscsi", "r") as f: - return f.read().strip().split("=",1)[1] + return f.read().strip().split("=", 1)[1] def findUnderlyingStorage(devPath): diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py index ef544eb..b343566 100644 --- a/vdsm/storage/resourceManager.py +++ b/vdsm/storage/resourceManager.py @@ -150,11 +150,11 @@ Internal request object, don't use directly """ _log = logging.getLogger("ResourceManager.Request") - namespace = property(lambda self : self._namespace) - name = property(lambda self : self._name) - fullName = property(lambda self : "%s.%s" % (self._namespace, self._name)) - lockType = property(lambda self : self._lockType) - syncRoot = property(lambda self : self._syncRoot) + namespace = property(lambda self: self._namespace) + name = property(lambda self: self._name) + fullName = property(lambda self: "%s.%s" % (self._namespace, self._name)) + lockType = property(lambda self: self._lockType) + syncRoot = property(lambda self: self._syncRoot) def __init__(self, namespace, name, lockType, callback): self._syncRoot = threading.RLock() @@ -166,7 +166,7 @@ self._doneEvent = threading.Event() self._callback = callback self.reqID = str(uuid4()) - self._log = SimpleLogAdapter(self._log, {"ResName" : self.fullName, "ReqID" : self.reqID}) + self._log = SimpleLogAdapter(self._log, {"ResName": self.fullName, "ReqID": self.reqID}) # Because findCaller is expensive. We make sure it wll be printed before # calculating it @@ -237,17 +237,17 @@ This object will auto release the referenced resource unless autorelease is set to `False` """ _log = logging.getLogger("ResourceManager.ResourceRef") - namespace = property(lambda self : self._namespace) - name = property(lambda self : self._name) - fullName = property(lambda self : "%s.%s" % (self._namespace, self._name)) + namespace = property(lambda self: self._namespace) + name = property(lambda self: self._name) + fullName = property(lambda self: "%s.%s" % (self._namespace, self._name)) # States whether this reference is pointing to an owned reference - isValid = property(lambda self : self._isValid) + isValid = property(lambda self: self._isValid) def __init__(self, namespace, name, wrappedObject=None, resRefID=str(uuid4())): self._namespace = namespace self._name = name - self._log = SimpleLogAdapter(self._log, {"ResName" : self.fullName, "ResRefID" : resRefID}) + self._log = SimpleLogAdapter(self._log, {"ResName": self.fullName, "ResRefID": resRefID}) self.__wrappedObject = wrappedObject if wrappedObject is not None: @@ -259,7 +259,7 @@ def __wrapObj(self): for attr in dir(self.__wrappedObject): - if hasattr(self,attr) or attr in ('close', 'switchLockType'): + if hasattr(self, attr) or attr in ('close', 'switchLockType'): continue setattr(self, attr, partial(self.__methodProxy, attr)) diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index ac5e1db..72443c6 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -86,11 +86,11 @@ SP_MD_FIELDS = { # Key dec, enc - PMDK_DOMAINS : (domainListDecoder, domainListEncoder), - PMDK_POOL_DESCRIPTION : (unicodeDecoder, unicodeEncoder), - PMDK_LVER : (int, str), - PMDK_SPM_ID : (int, str), - PMDK_MASTER_VER : (int, str) + PMDK_DOMAINS: (domainListDecoder, domainListEncoder), + PMDK_POOL_DESCRIPTION: (unicodeDecoder, unicodeEncoder), + PMDK_LVER: (int, str), + PMDK_SPM_ID: (int, str), + PMDK_MASTER_VER: (int, str) } # Calculate how many domains can be in the pool before overflowing the Metadata @@ -1368,24 +1368,24 @@ disktotal, diskfree = st.diskUtilization vgmdtotal, vgmdfree = st.vgMdUtilization res[sdUUID] = { - 'finish' : st.lastCheck, - 'result' : { - 'code' : code, - 'lastCheck' : '%.1f' % (now - st.lastCheck), - 'delay' : str(st.readDelay), - 'valid' : (st.error is None) + 'finish': st.lastCheck, + 'result': { + 'code': code, + 'lastCheck': '%.1f' % (now - st.lastCheck), + 'delay': str(st.readDelay), + 'valid': (st.error is None) }, - 'disktotal' : disktotal, - 'diskfree' : diskfree, + 'disktotal': disktotal, + 'diskfree': diskfree, - 'mdavalid' : st.vgMdHasEnoughFreeSpace, - 'mdathreshold' : st.vgMdFreeBelowThreashold, - 'mdasize' : vgmdtotal, - 'mdafree' : vgmdfree, + 'mdavalid': st.vgMdHasEnoughFreeSpace, + 'mdathreshold': st.vgMdFreeBelowThreashold, + 'mdasize': vgmdtotal, + 'mdafree': vgmdfree, - 'masterValidate' : { - 'mount' : st.masterMounted, - 'valid' : st.masterValid + 'masterValidate': { + 'mount': st.masterMounted, + 'valid': st.masterValid } } return res @@ -1449,14 +1449,14 @@ stats['disktotal'] = repoStats[item]['disktotal'] stats['diskfree'] = repoStats[item]['diskfree'] if not repoStats[item]['mdavalid']: - alerts.append({'code':se.SmallVgMetadata.code, - 'message':se.SmallVgMetadata.message}) + alerts.append({'code': se.SmallVgMetadata.code, + 'message': se.SmallVgMetadata.message}) self.log.warning("VG %s's metadata size too small %s", dom.sdUUID, repoStats[item]['mdasize']) if not repoStats[item]['mdathreshold']: - alerts.append({'code':se.VgMetadataCriticallyFull.code, - 'message':se.VgMetadataCriticallyFull.message}) + alerts.append({'code': se.VgMetadataCriticallyFull.code, + 'message': se.VgMetadataCriticallyFull.message}) self.log.warning("VG %s's metadata size exceeded critical size: \ mdasize=%s mdafree=%s", dom.sdUUID, repoStats[item]['mdasize'], repoStats[item]['mdafree']) @@ -1479,7 +1479,7 @@ for item in domDict: try: dom = sdCache.produce(item) - except se.StorageDomainDoesNotExist : + except se.StorageDomainDoesNotExist: self.log.warn("Storage domain %s does not exist", item) continue diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index f678a04..c74fccc 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -57,7 +57,7 @@ MESSAGES_PER_MAILBOX = SLOTS_PER_MAILBOX - 1 # Last message slot is reserved for metadata (checksum, extendable mailbox, etc) _zeroCheck = misc.checksum(EMPTYMAILBOX, CHECKSUM_BYTES) -pZeroChecksum = struct.pack('<l',_zeroCheck) # Assumes CHECKSUM_BYTES equals 4!!! +pZeroChecksum = struct.pack('<l', _zeroCheck) # Assumes CHECKSUM_BYTES equals 4!!! def dec2hex(n): return "%x" % n @@ -102,9 +102,9 @@ domain = misc.packUuid(volumeData['domainID']) volume = misc.packUuid(volumeData['volumeID']) # Build base payload - payload = MESSAGE_VERSION + EXTEND_CODE + domain + volume + self.newSize.rjust(SIZE_CHARS,"0") + payload = MESSAGE_VERSION + EXTEND_CODE + domain + volume + self.newSize.rjust(SIZE_CHARS, "0") # Pad payload with zeros - self.payload = payload.ljust(MESSAGE_SIZE,"0") + self.payload = payload.ljust(MESSAGE_SIZE, "0") self.log.debug('new extend msg created: domain: %s, volume: %s', volumeData['domainID'], volumeData['volumeID']) @@ -135,8 +135,8 @@ volume = {} volume['poolID'] = pool.spUUID - volume['domainID'] = misc.unpackUuid(payload[sdOffset : sdOffset+PACKED_UUID_SIZE]) - volume['volumeID'] = misc.unpackUuid(payload[volumeOffset : volumeOffset+PACKED_UUID_SIZE]) + volume['domainID'] = misc.unpackUuid(payload[sdOffset: sdOffset+PACKED_UUID_SIZE]) + volume['volumeID'] = misc.unpackUuid(payload[volumeOffset: volumeOffset+PACKED_UUID_SIZE]) size = int(payload[sizeOffset:sizeOffset + SIZE_CHARS], 16) cls.log.info("processRequest: extending volume %s " @@ -289,18 +289,18 @@ # rc = True - newMsg = newMsgs[start : start + MESSAGE_SIZE] + newMsg = newMsgs[start: start + MESSAGE_SIZE] if newMsg == CLEAN_MESSAGE: del self._activeMessages[i] self._used_slots_array[i] = 0 self._msgCounter -= 1 - self._outgoingMail = self._outgoingMail[0 : start] + MESSAGE_SIZE * "\0" + self._outgoingMail[start + MESSAGE_SIZE : ] + self._outgoingMail = self._outgoingMail[0: start] + MESSAGE_SIZE * "\0" + self._outgoingMail[start + MESSAGE_SIZE: ] continue msg = self._activeMessages[i] self._activeMessages[i] = CLEAN_MESSAGE - self._outgoingMail = self._outgoingMail[0 : start] + CLEAN_MESSAGE + self._outgoingMail[start + MESSAGE_SIZE : ] + self._outgoingMail = self._outgoingMail[0: start] + CLEAN_MESSAGE + self._outgoingMail[start + MESSAGE_SIZE: ] try: self.log.debug("HSM_MailboxMonitor(%s/%s) - Checking reply: %s", self._msgCounter, MESSAGES_PER_MAILBOX, repr(newMsg)) @@ -338,9 +338,9 @@ def _sendMail(self): self.log.info("HSM_MailMonitor sending mail to SPM - " + str(self._outCmd)) - chk = misc.checksum(self._outgoingMail[0 : MAILBOX_SIZE-CHECKSUM_BYTES], CHECKSUM_BYTES) - pChk = struct.pack('<l',chk) # Assumes CHECKSUM_BYTES equals 4!!! - self._outgoingMail = self._outgoingMail[0 : MAILBOX_SIZE-CHECKSUM_BYTES] + pChk + chk = misc.checksum(self._outgoingMail[0: MAILBOX_SIZE-CHECKSUM_BYTES], CHECKSUM_BYTES) + pChk = struct.pack('<l', chk) # Assumes CHECKSUM_BYTES equals 4!!! + self._outgoingMail = self._outgoingMail[0: MAILBOX_SIZE-CHECKSUM_BYTES] + pChk misc.execCmd(self._outCmd, data=self._outgoingMail, sudo=False) @@ -393,7 +393,7 @@ try: #self.log.debug("No requests in queue, going to sleep until new requests arrive") # Check if a new message is waiting to be sent - message = self._queue.get(block=True,timeout=self._monitorInterval) + message = self._queue.get(block=True, timeout=self._monitorInterval) self._handleMessage(message) message = None sendMail = True @@ -542,9 +542,9 @@ def _validateMailbox(self, mailbox, mailboxIndex): chkStart = MAILBOX_SIZE-CHECKSUM_BYTES - chk = misc.checksum(mailbox[0 : chkStart], CHECKSUM_BYTES) - pChk = struct.pack('<l',chk) # Assumes CHECKSUM_BYTES equals 4!!! - if pChk != mailbox[chkStart : chkStart+CHECKSUM_BYTES]: + chk = misc.checksum(mailbox[0: chkStart], CHECKSUM_BYTES) + pChk = struct.pack('<l', chk) # Assumes CHECKSUM_BYTES equals 4!!! + if pChk != mailbox[chkStart: chkStart+CHECKSUM_BYTES]: self.log.error("SPM_MailMonitor: mailbox %s checksum failed, not clearing mailbox, clearing newMail.", str(mailboxIndex)) return False elif pChk == pZeroChecksum: return False # Ignore messages of empty mailbox @@ -573,7 +573,7 @@ # Most mailboxes are probably empty so it costs less to check that all messages start with 0 than # to validate the mailbox, therefor this is done after we find a non empty message in mailbox if not isMailboxValidated: - if not self._validateMailbox(newMail[mailboxStart : mailboxStart + MAILBOX_SIZE], host): + if not self._validateMailbox(newMail[mailboxStart: mailboxStart + MAILBOX_SIZE], host): #Cleaning invalid mbx in newMail newMail = newMail[:mailboxStart] + EMPTYMAILBOX + newMail[mailboxStart + MAILBOX_SIZE:] break @@ -581,13 +581,13 @@ isMailboxValidated = True - newMsg = newMail[msgStart : msgStart+MESSAGE_SIZE] + newMsg = newMail[msgStart: msgStart+MESSAGE_SIZE] msgOffset = msgId * MESSAGE_SIZE if newMsg == CLEAN_MESSAGE: # Should probably put a setter on outgoingMail which would take the lock self._outLock.acquire() try: - self._outgoingMail = self._outgoingMail[0:msgOffset] + CLEAN_MESSAGE + self._outgoingMail[msgOffset+MESSAGE_SIZE : self._outMailLen] + self._outgoingMail = self._outgoingMail[0:msgOffset] + CLEAN_MESSAGE + self._outgoingMail[msgOffset+MESSAGE_SIZE: self._outMailLen] finally: self._outLock.release() send = True @@ -605,14 +605,14 @@ # We only get here if there is a novel request try: - msgType = newMail[msgStart+1 : msgStart+5] + msgType = newMail[msgStart+1: msgStart+5] if msgType in self._messageTypes: # Use message class to process request according to message specific logic id = str(uuid.uuid4()) - self.log.debug("SPM_MailMonitor: processing request: %s" % repr(newMail[msgStart : msgStart+MESSAGE_SIZE])) + self.log.debug("SPM_MailMonitor: processing request: %s" % repr(newMail[msgStart: msgStart+MESSAGE_SIZE])) res = self.tp.queueTask(id, runTask, (self._messageTypes[msgType], msgId, - newMail[msgStart : msgStart+MESSAGE_SIZE]) + newMail[msgStart: msgStart+MESSAGE_SIZE]) ) if not res: raise Exception() @@ -663,9 +663,9 @@ self._outLock.acquire() try: msgOffset = msgID*MESSAGE_SIZE - self._outgoingMail = self._outgoingMail[0:msgOffset] + msg.payload + self._outgoingMail[msgOffset+MESSAGE_SIZE : self._outMailLen] + self._outgoingMail = self._outgoingMail[0:msgOffset] + msg.payload + self._outgoingMail[msgOffset+MESSAGE_SIZE: self._outMailLen] mailboxOffset = (msgID / SLOTS_PER_MAILBOX) * MAILBOX_SIZE - mailbox = self._outgoingMail[mailboxOffset : mailboxOffset + MAILBOX_SIZE] + mailbox = self._outgoingMail[mailboxOffset: mailboxOffset + MAILBOX_SIZE] cmd = self._outCmd + ['bs=' + str(MAILBOX_SIZE), 'seek=' + str(mailboxOffset / MAILBOX_SIZE)] #self.log.debug("Running command: %s, for message id: %s", str(cmd), str(msgID)) (rc, out, err) = misc.execCmd(cmd, sudo=False, data=mailbox) diff --git a/vdsm/storage/threadPool.py b/vdsm/storage/threadPool.py index 22633b7..7edaeb2 100644 --- a/vdsm/storage/threadPool.py +++ b/vdsm/storage/threadPool.py @@ -252,13 +252,13 @@ pool = ThreadPool(100) # Insert tasks into the queue and let them run - print "Running tasks: ", pool.getRunningTasks(),"\n" + print "Running tasks: ", pool.getRunningTasks(), "\n" pool.queueTask(sortTask, (1000, 100000), taskCallback) - print "Running tasks: ", pool.getRunningTasks(),"\n" + print "Running tasks: ", pool.getRunningTasks(), "\n" pool.queueTask(waitTask, 5, taskCallback) pool.queueTask(sortTask, (200, 200000), taskCallback) pool.queueTask(waitTask, 2, taskCallback) - print "Running tasks: ", pool.getRunningTasks(),"\n" + print "Running tasks: ", pool.getRunningTasks(), "\n" pool.queueTask(sortTask, (3, 30000), taskCallback) pool.queueTask(waitTask, 7, taskCallback) diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index 0fe1275..6613ad3 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -90,8 +90,8 @@ CORE_DUMP_PATH = '/var/lib/vdsm/core' CORE_PATTERN = '/proc/sys/kernel/core_pattern' XML_QUOTES = { - "\n":' ', - "'":'~' + "\n": ' ', + "'": '~' } # Regular expression used to validate content of SSH public keys: @@ -136,7 +136,7 @@ if input is not None: logging.debug(input) stdin = subprocess.PIPE - p = subprocess.Popen(argv , stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p = subprocess.Popen(argv, stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = p.communicate(input) rc = p.returncode logging.debug(out) @@ -340,7 +340,7 @@ elif arch == "ppc64": if os.path.exists('/proc/device-tree/system-id'): #eg. output IBM,03061C14A - return file('/proc/device-tree/system-id').readline().replace(",","") + return file('/proc/device-tree/system-id').readline().replace(",", "") logging.error("getMachineUUID: Could not find machine's UUID.") @@ -810,12 +810,12 @@ #Create temp file fh, abs_path = mkstemp() - new_file = open(abs_path,'w') + new_file = open(abs_path, 'w') old_file = open(fileName) #Iterate over the existing file, while replacing if needed. for line in old_file: #Note: the line below must not have spaces before or after the '=', since it'll fail bash scripts ! - newLine = re.sub('^[#\s]*%s\s*=.*' % key , '%s=%s' % (key, value), line) + newLine = re.sub('^[#\s]*%s\s*=.*' % key, '%s=%s' % (key, value), line) if re.match('^%s=%s$' % (re.escape(key), re.escape(value)), newLine): logging.debug("_updateFileLine: replacing " + str(line) + " with: " + newLine) fReplaced = True @@ -1023,7 +1023,7 @@ if fReturn: try: lstBridgeOptions.append('blockingdhcp=true') - out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_ADD) , bridgeName, vlan, bonding, nic] + lstBridgeOptions) + out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_ADD), bridgeName, vlan, bonding, nic] + lstBridgeOptions) if ret: raise Exception('Failed to add bridge') except: diff --git a/vdsm_reg/engine.py.in b/vdsm_reg/engine.py.in index f29d129..d03d978 100644 --- a/vdsm_reg/engine.py.in +++ b/vdsm_reg/engine.py.in @@ -133,7 +133,7 @@ config = {} config["vdc_host_port"] = VDC_HOST_PORT for line in vdsm_config: - line = line.strip().replace(" ","").split("=") + line = line.strip().replace(" ", "").split("=") if "vdc_host_name" in line: item, config["vdc_host_name"] = line[0], line[1] if "vdc_host_port" in line: @@ -161,7 +161,7 @@ self.ncs.screen.setColor(customColorset(1), "black", "magenta") heading.setColors(customColorset(1)) elements.setField(heading, 0, 0, anchorLeft = 1) - engine_grid = Grid(2,2) + engine_grid = Grid(2, 2) engine_grid.setField(Label("Management Server:"), 0, 0, anchorLeft = 1) self.engine_server = Entry(25, "") self.engine_server.setCallback(self.validEngineServerCallback) @@ -170,14 +170,14 @@ self.engine_server_port.setCallback(self.validEngineServerPortCallback) engine_grid.setField(self.engine_server, 1, 0, anchorLeft = 1, padding=(2, 0, 0, 1)) engine_grid.setField(self.engine_server_port, 1, 1, anchorLeft = 1, padding=(2, 0, 0, 0)) - elements.setField(engine_grid, 0, 1, anchorLeft = 1, padding = (0,0,0,0)) + elements.setField(engine_grid, 0, 1, anchorLeft = 1, padding = (0, 0, 0, 0)) elements.setField(Label(""), 0, 2, anchorLeft = 1) self.verify_engine_cert = Checkbox("Connect to @ENGINENAME@ and Validate Certificate", isOn=True) - elements.setField(self.verify_engine_cert, 0, 3, anchorLeft = 1, padding = (0,0,0,0)) + elements.setField(self.verify_engine_cert, 0, 3, anchorLeft = 1, padding = (0, 0, 0, 0)) elements.setField(Label(""), 0, 4, anchorLeft = 1) elements.setField(Label("Optional password for adding node through @ENGINENAME@ UI"), 0, 5, anchorLeft = 1) - pw_elements = Grid(3,3) + pw_elements = Grid(3, 3) pw_elements.setField(Label("Password: "), 0, 1, anchorLeft = 1) self.root_password_1 = Entry(15, password=1) @@ -192,7 +192,7 @@ self.pw_resp = PASSWORD_MATCH elements.setField(pw_elements, 0, 6, anchorLeft=1) - elements.setField(self.pw_msg, 0, 7, padding = (0,0,0,0)) + elements.setField(self.pw_msg, 0, 7, padding = (0, 0, 0, 0)) inputFields = [self.engine_server, self.engine_server_port, self.verify_engine_cert, self.root_password_1, self.root_password_2] @@ -202,7 +202,7 @@ try: engine_server = getEngineConfig() - engine_server,engine_port = engine_server.split(":") + engine_server, engine_port = engine_server.split(":") if engine_server.startswith("None"): self.engine_server.set("") else: -- To view, visit http://gerrit.ovirt.org/9436 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24a0b990395242dff75ed72b42dce944060e0b26 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 7

Change in vdsm[master]: Fixing pep8 error that rises with rhel6.3 pep8 version
by ybronhei＠redhat.com 26 Nov '12

26 Nov '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: Fixing pep8 error that rises with rhel6.3 pep8 version ...................................................................... Fixing pep8 error that rises with rhel6.3 pep8 version deprecated form of raising exception error Change-Id: I7b973beec494f452d66df646b2af6b2f9e8e15bf Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm/storage/misc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/9451/1 diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 6360dcf..bc32590 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -738,7 +738,7 @@ # re-raise the earliest exception if firstException is not None: - raise firstException, None, traceback + raise (firstException, None, traceback) def defer(self, func, *args, **kwargs): self._finally.append((func, args, kwargs)) -- To view, visit http://gerrit.ovirt.org/9451 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b973beec494f452d66df646b2af6b2f9e8e15bf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

3 5

← Newer
1
...
28
29
30
31
32
33
34
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches November 2012