Commit Graph

135 Commits

Author SHA1 Message Date
ligc
c760a04d27 fix for bug 3091008: special case for DB2 SQL statement
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7928 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-10-26 08:11:34 +00:00
jbjohnso
c3e5302619 -Fix getNodeAttribs
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7736 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-30 14:30:58 +00:00
lissav
f3d80d40a1 add support for setting database engine for mysql in Schema
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7459 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-15 12:56:05 +00:00
jbjohnso
df0a17d223 -Have 'getAllNodeAttribs' honor nodecol
-Have MacMap use getAllNodeAttribs to allow for noderange described switches/inheritence
-Fix getbmcconfig to use a suffix that will pass complexity rules
-Fix getbmcconfig to pass through bmcport even if genpasswords is in use


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7437 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-13 18:54:26 +00:00
lissav
31f5cc6e91 fix reuse of variable
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7436 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-13 13:05:14 +00:00
lissav
9a7b4ff7ff allow underscore in user defined tables and sql file names, note more work needed if want to allow test_x_mysql.pm for a name
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7383 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-08 18:58:59 +00:00
lissav
32c4db2c46 in updateschema, tabdump and create backup *.csv file before starting to change keys
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7362 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-06 12:01:59 +00:00
lissav
d3295bc15e move updateschema from Table->new to xcatd
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7335 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-01 14:09:38 +00:00
lissav
8216a254ad for db2 add logic to move to larger tablespace on add columns in updateschema
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7325 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-31 19:18:47 +00:00
lissav
1eeae6603c add DB2 support for adding keys to tables
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7323 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-31 17:23:28 +00:00
lissav
b76b8f87a5 fix add columns for db2
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7320 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-31 13:57:24 +00:00
lissav
9bea5c5075 honor type statement on keys
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7313 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-30 20:04:27 +00:00
lissav
f2fb69f021 add support for array of file names in get_filelist
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7227 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-25 15:18:04 +00:00
jbjohnso
e89dd334f0 -Add 'mknum' directive to nodeattribute expansion
-Try Safe module instead of clunky regexes to protect against bad data


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7213 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-24 20:46:22 +00:00
lissav
d1e30c8f7b fix return structure from get_filelist
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7199 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-24 13:27:45 +00:00
lissav
dc27bd58d5 change for new syntax in CNM support to get_filelist
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7198 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-24 12:24:45 +00:00
lissav
86a1fc10a7 add get_filelist routine for build the appropriate .sql and .pm files to run for the user, needed by xcatd and runsqlfiles
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7191 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-23 18:03:45 +00:00
lissav
7b81722d10 remove foreign key logic from buildcreate routine
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7167 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-20 12:53:05 +00:00
cjhardee
5b4ba54a2d Cross your fingers that this makes the million and a half dependant things happy. Changed the output of getNodeAttributes to merge the data from its different groups and to clone entries from one group for each entry in a folowing group with data in it.
I'm just gonna paste the description Jarrod sent to the group via email:

So if getAttribs ever returns more than one result, then getNodeAttribs will have it's output multiplied by that factor.  I'll draw out a table with changes Chris started adding while he was also trying to flatten the recursion.  Let's say 'n1' is in groups 'g1,g2,g3', and that we request columns 'c1,c2,c3,c4'  Let's also assume the primary key is not simply 'node', allowing the node column to contain duplicates (as in switch table).  I don't expect anyone to actually construct something this convoluted in practice, but:

node    |c1     |c2     |c3     |c4
n1      |v1     |       |       |
g2      |       |V2+=   |       |
g2      |       |v3     |v4     |
g3      |       |v5     |       |v6
g3      |       |v7     |v8     |v9

First, we get n1s record:
[
{ node => 'n1',  c1 => 'v1',}
]
We see that c2-c4 are still unsatisfiad, then we check g1, see there is no record, so no action takes place, then getAttribs node=>'g2' returns two records.  As a result, we clone our results so far and independently populate them:
[
{ node => 'n1', c1=> 'v1', c2 => 'v2+=' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4'},
]
Now, in the first record, we are still looking to fill in c3, c4, and we are also still looking at c2 to complete the '+=' operation.
In the second record, we only need c4 now, no other columns will be checked for that record.

Then we hit g3.  We also get two results back (two was easier, but arbitrarily many are possible, btw).  Since both records are still looking to be completed, the two become 4 records (if one of the two records were satisfied before this point, the two would have become three instead):

[
{ node => 'n1', c1=> 'v1', c2 => 'v2v5',c4=>'v6' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4',c4=>'v6'},
{ node => 'n1', c1=> 'v1', c2 => 'v2v7',c3=>v8,c4=>'v9' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4',c4=>'v9'},
]

And that would be what getNodesAttribs would return in this case.




git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7131 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-18 18:14:48 +00:00
lissav
34a349cae0 add support for Foreign keys in Schema
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7127 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-18 15:06:17 +00:00
cjhardee
f8c12d6285 fixed nodels to include mutliple results from the same group and to return [undef] when there are no results instead of [{}]
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7087 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-13 14:40:26 +00:00
lissav
37640c0498 More DB2/MYSQl fixes to setNodesAttribs
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7071 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-12 16:26:20 +00:00
jbjohnso
30553d8b13 -Remove debug output
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7023 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-10 14:08:49 +00:00
lissav
b1c06a86ed fix bad problem in creating tables in db2- I introduces
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7022 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-10 13:29:46 +00:00
jbjohnso
e82e3f5f8b -Give up after 30 seconds of starvation
-Actually sleep in the retry loop rather than being a busy loop


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6992 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-06 12:54:41 +00:00
lissav
5f21467bca fix setting of types for attributes to invalid types for DB2 as much as possible for now
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6978 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-04 14:17:31 +00:00
lissav
9d7014c2ca fix mysql calls in setNodesAtt
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6954 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-03 14:12:05 +00:00
lissav
d1f418d1d7 fix changed code in setNodesAttribs for DB2
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6941 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-02 13:24:53 +00:00
cjhardee
6cc88808d4 Fixed a problem with missing attributes from getNodeAttributes
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6894 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-07-28 16:19:51 +00:00
cjhardee
1ed64502bb Fixed a bug I introduced when adding the ability to get multiple results from nodes and thier groups using nodels. The problem was the results had multiple entries for some attributes.
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6884 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-07-28 06:17:30 +00:00
cjhardee
21f033432c Rewrote how attributes from a node and it's groups are looked up and added the ability to concatinate values for these attributes from mulitple sources by adding "+=NEXTRECORD" to the values in the data.
For example, if bootparams.addkcmdline for the node is "test1+=NEXTRECORD" and bootparams.addkcmdline for the group it is in is "test2", the returned values from nodels for bootparams.addkcmdline will be "test1 test2".

Not that this stops after it finds a single occurance of a value for this attriute without the "+=NEXTRECORD".  If all values from the groups are wanted, each should have "+=NEXTRECORD" at the end of the entry.



git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6840 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-07-23 15:47:21 +00:00
jbjohnso
e032aa9375 -Nonstop xCAT, xcatd starting replaces old xCAT instance with nearly no interruption
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6680 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-07-08 20:49:12 +00:00
lissav
5e5d506704 fix changes to getAllAttributesWhere, reading all table entries
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5816 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-04-19 16:03:09 +00:00
lissav
7bb245ceef expand getAllAttribsWhere to accetp ALL to return all attributes in the table
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5731 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-04-09 13:37:51 +00:00
lissav
2067bafb90 more work on getAllAttribsWhere
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5683 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-04-06 13:32:23 +00:00
lissav
004256d3a6 fix comments
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5682 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-04-06 13:17:37 +00:00
lissav
298ed86f6c fix syntax error in mysql path of getAllAttribsWhere routine
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5673 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-04-05 19:42:12 +00:00
linggao
2b1673a9d0 fixed a problem for notification
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5648 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-04-01 20:02:08 +00:00
lissav
c9e5a7a9d2 remove truncate routine, will no use
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5582 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-03-25 17:47:05 +00:00
lissav
8490ba2f8f fix db2 eventlog/auditlog creattion
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5562 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-03-23 16:18:40 +00:00
jbjohnso
f3daa4d8e0 -Provide a means for nodels to display group inheritence
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5395 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-03-05 22:28:36 +00:00
lissav
bd065d13c1 for all databases commit immediately after table create
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5338 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-03-02 18:09:09 +00:00
lissav
9c63655629 for db2 must check schema and table name for existence. Create table add other tables to the xcatdb database one is a system policy table
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5253 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-02-22 19:09:41 +00:00
lissav
57d6581450 db2 fix
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5242 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-02-19 18:55:34 +00:00
jbjohnso
91cc6ff09d -Fix mistake in previous change
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5241 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-02-19 18:44:02 +00:00
jbjohnso
4e76bb177c -Refresh cache if it is modified
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5233 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-02-19 14:45:49 +00:00
jbjohnso
c0c7ff2c54 -Fix erroneous db worker process cloning
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5231 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-02-17 22:19:39 +00:00
lissav
1921256e4c must export the DB2INSTANCE before the connect to the database. This is need particularly for the daemon which cannot get it from the environement
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5230 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-02-17 14:38:03 +00:00
lissav
1fcbdfcbb2 more db2 fixes
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5201 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-02-09 16:20:43 +00:00
lissav
ba56b58079 more db2 updates
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5189 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-02-08 14:29:47 +00:00