Split entry configuration from main factory config
Jeff made the changes. Need to be reviewed and integrated into main code base.
From: Jeffrey Dost Subject: factory config mods, entries.d Date: April 23, 2015 at 2:11:08 PM CDT To: Parag Mhashilkar Hi Parag, I've finished an implementation that gives me everything we need to start hosting our factory configs in git, to better share between factories. As a high level overview things changed - striped out all usage of cgWParams.GlideinParams. I replaced this xml "parser" in favor of just straight xml.dom.minidom parsing, and added a small utility library factXmlUtil that has some helper functions. - removed schedd_name references in xml file. This was the only thing in the entries that is factory specific since it had the host names in it. - no longer put glideinWMS.xml under internal factory "version control", instead there is only 1 config file at any given time, the one we modify, either in /etc/gwms-factory if rpm, or the *.cfg dir. - a corollary to the above, nothing ever writes back to this xml file, we always found that annoying. In other words, a factory reconfig won't rearrange / generate xml, etc - added the ability to look for entries in other *.xml files located in an entries.d dir located under /etc/gwms-factory or *.cfg, if it exists. This allows us to split the entries into their own files however we we want. If you'd like to review my work, find the fork in my github. You can diff master with the jeff_rewrite_fact_xml branch to see the changes: https://github.com/jdost321/glideinWMS/tree/jeff_rewrite_fact_xml Let me know what's next, and if you accept my changes, what we can do next to get it pushed back into the glideinwms upstream. Thanks! Jeff
#3 Updated by Parag Mhashilkar over 4 years ago
- Status changed from New to Feedback
- Assignee changed from Parag Mhashilkar to Marco Mambelli
- Target version changed from v3_3 to v3_2_12
Original changes are in Jeff's github repo. I have pulled them into our repo under jeff_rewrite_fact_xml
git checkout branch_v3_2 git checkout -b jeff_rewrite_fact_xml git remote add --fetch github-jeff https://github.com/jdost321/glideinWMS.git git merge github-jeff/jeff_rewrite_fact_xml
#4 Updated by Marco Mambelli over 4 years ago
Feedback was discussed and the only change after the review is a wrong variable name.
Created a ticket branch, v3/8437, merged the branch tracking Jeff's changes and added the correction before merging to branch_v3_2.
We decided against a rebase of the changes to avoid confusion in case Jess decides for other changes.
#9 Updated by HyunWoo Kim over 4 years ago
- Status changed from Feedback to Assigned
- Assignee changed from HyunWoo Kim to Marco Mambelli
I have reviewed the 3 files that have changed:
All the changes except for one are about adjusting indentations and removing unnecessary empty lines
and the only change is switching from if not A in B to if A not in B which must be equivalent.
- most of the changes are indentations and lines
- In some, arguments are added to resolve the complaints from pylint (per Marco)
- another instance of using if A not in B
Suggestion> why don't we write a comment for def add_child, def merge_defaults and def merge
saying that omitting the second arguments in these methods will result in pylint complaints?
- just indentations and lines