2
0
mirror of https://github.com/xcat2/confluent.git synced 2026-06-02 09:19:39 +00:00
Commit Graph

873 Commits

Author SHA1 Message Date
Jarrod Johnson 2dcdfe58c3 Merge remote-tracking branch 'upstream/master' 2017-02-15 10:47:04 -05:00
Jarrod Johnson 2e547129d1 Merge branch 'master' of github.com:jjohnson42/confluent 2017-02-15 10:46:34 -05:00
Jarrod Johnson b39ae42955 Add debug of broken expression to nodelist
If an expression is invalid, have nodelist give the error data
allowing the user to see and potentially take action.
2017-02-15 10:46:27 -05:00
Jarrod Johnson 9e593f0554 Clean up nodepower
nodepower boot and reset output was misleading.
2017-02-15 10:46:27 -05:00
Jarrod Johnson ecc6bcf96c Add the util to the setup.py
Previously packaging was missing the new utility
2017-02-15 10:46:27 -05:00
Jarrod Johnson 6ad383c6ad Assure deterministic enumeration of areas
nodegroup must be restored first.
2017-02-15 10:46:27 -05:00
Jarrod Johnson 446d2270c9 Give a friendlier message on restore of redact DB
A redacted dump will not have a keys.json file, which
is natural.  Replace 'file not found' with a message
indicating the possibility of a redacted dump.
2017-02-15 10:46:27 -05:00
Jarrod Johnson 5395f97a21 Do not write out keys when redacting
It's silly to store keys when redact is requested
2017-02-15 10:46:27 -05:00
Jarrod Johnson 04781e0ece Actually hook up the redact feature 2017-02-15 10:46:27 -05:00
Jarrod Johnson 9bd0b7af9d Make confluentdbutil executable 2017-02-15 10:46:27 -05:00
Jarrod Johnson ae806e55b0 Add a utility to frontend DB dump/restore
This exposes the library functions as a utility
2017-02-15 10:46:26 -05:00
Jarrod Johnson 393ea41696 Implement restore from db
This provides at least restore for the primary tenant (the only tenant currently used by anyone)
2017-02-15 10:46:26 -05:00
Jarrod Johnson b87cb87c2a Flesh out the restoration of the master keys
With this commit, the key portion of import should be complete.
2017-02-15 10:46:26 -05:00
Jarrod Johnson a91d7047b2 Start work on a db restore
Start by parsing the previously dumped key data, since the key data requires special handling.
2017-02-15 10:46:26 -05:00
Jarrod Johnson 638842beec Fix no password backup
If password=None was supplied, it would fail.  Now accomodate unprotected keys.
2017-02-15 10:46:26 -05:00
chenglch 5678942186 Merge pull request #65 from jjohnson42/handleinflight
Protect against stale data in new requests
2017-02-14 15:03:32 +08:00
Jarrod Johnson f46269a6f2 Add debug of broken expression to nodelist
If an expression is invalid, have nodelist give the error data
allowing the user to see and potentially take action.
2017-02-10 16:41:47 -05:00
Jarrod Johnson 583e3474ac Do not yield data to discard 2017-02-10 11:37:56 -05:00
Jarrod Johnson ffbe1ab156 Protect against stale data in new requests
If a caller (reasonably) broke out of a loop, a subsequent call would get old data.
Protect against this by discarding data not consumed if previously called.
2017-02-10 11:20:39 -05:00
Jarrod Johnson 9e4bb84932 Merge branch 'master' into dbbackrestore 2017-02-07 13:02:48 -05:00
Jarrod Johnson ffd1bdfae3 Clean up nodepower
nodepower boot and reset output was misleading.
2017-02-02 17:00:09 -05:00
Jarrod Johnson 02dd29b027 Add the util to the setup.py
Previously packaging was missing the new utility
2017-01-31 15:38:54 -05:00
Jarrod Johnson 3b38d8ac43 Assure deterministic enumeration of areas
nodegroup must be restored first.
2017-01-30 16:38:43 -05:00
Jarrod Johnson c381fefc49 Give a friendlier message on restore of redact DB
A redacted dump will not have a keys.json file, which
is natural.  Replace 'file not found' with a message
indicating the possibility of a redacted dump.
2017-01-30 16:27:49 -05:00
Jarrod Johnson a288136a80 Do not write out keys when redacting
It's silly to store keys when redact is requested
2017-01-30 16:13:49 -05:00
Jarrod Johnson cbc0ffbc1c Actually hook up the redact feature 2017-01-30 16:12:49 -05:00
Jarrod Johnson cfc6fd04fc Make confluentdbutil executable 2017-01-30 16:10:01 -05:00
Jarrod Johnson 4a4b1a623f Add a utility to frontend DB dump/restore
This exposes the library functions as a utility
2017-01-30 16:08:28 -05:00
Jarrod Johnson f1867f900d Implement restore from db
This provides at least restore for the primary tenant (the only tenant currently used by anyone)
2017-01-30 15:31:36 -05:00
Jarrod Johnson 12ed7c50fb Merge branch 'dbbackrestore' of github.com:jjohnson42/confluent into dbbackrestore 2017-01-30 09:10:51 -05:00
Jarrod Johnson 85205867b3 Flesh out the restoration of the master keys
With this commit, the key portion of import should be complete.
2017-01-27 16:50:03 -05:00
Jarrod Johnson 60c1cab56f Merge branch 'master' into dbbackrestore 2017-01-27 16:27:34 -05:00
Jarrod Johnson 15c84e8a9b Modify setup.py.tmpl to be adaptive
This should prevent forgetting to add content to
setup.py moving forward.
2017-01-27 15:23:16 -05:00
Jarrod Johnson 1028f1cb60 Have nodeboot be executable 2017-01-27 14:48:09 -05:00
Jarrod Johnson f245680732 Rename nodeboot.py to nodeboot
No point in having '.py' extensions
1.5
2017-01-27 14:29:55 -05:00
Jarrod Johnson 6007a923a9 Merge pull request #63 from aduffy19/master
update power menu
2017-01-27 14:28:45 -05:00
Amanda Duffy 36bc81448e Fix missing ] and add entries to printed menu 2017-01-27 14:25:42 -05:00
Jarrod Johnson 612350ca65 Provide for a terminal session to process normal commands
If it is not one of the 'special' terminal ones, assume it's a normal one.  Recurse into
the process request to handle it as a separate request.
2017-01-27 14:18:22 -05:00
Jarrod Johnson d07e5a08c9 Provide for a terminal session to process normal commands
If it is not one of the 'special' terminal ones, assume it's a normal one.  Recurse into
the process request to handle it as a separate request.
2017-01-27 14:17:29 -05:00
Amanda Duffy 8599485d56 Merge remote-tracking branch 'origin/master' 2017-01-27 13:44:37 -05:00
Amanda Duffy fdf74dbf11 Add power options for console commands 2017-01-27 13:44:12 -05:00
Jarrod Johnson d2e8fa6521 Start work on a db restore
Start by parsing the previously dumped key data, since the key data requires special handling.
2017-01-27 11:20:55 -05:00
Jarrod Johnson eca18a451b Fix no password backup
If password=None was supplied, it would fail.  Now accomodate unprotected keys.
2017-01-27 10:09:15 -05:00
Jarrod Johnson bc5efa8a7e Try restarting confluent if running on update
This mitigates chance of confluent being stale.
1.4.0
2017-01-20 15:50:12 -05:00
Jarrod Johnson 486c322233 Have binding network sockets occur in a retry loop
There seems to be scenarios where a previously used socket won't open up immediately.  Retry when
this is detected.
2017-01-17 13:59:22 -05:00
Jarrod Johnson 548e4404ce Fix confluent startup error if dead
Clean up stale dbg.sock if present rather than fail to start.  Also, if the pid indicated in pid file doesn't exist, ignore
the pidfile contents.
2017-01-06 13:43:02 -05:00
Jarrod Johnson 99e97fe5c4 Add the noderun command to the manifest
The noderun command was not being packaged.  Correct the
oversight so that it will be in packages.
2017-01-06 13:29:25 -05:00
Jarrod Johnson 8c13e738c0 Make usage/help more consistent across the commands
Have every client command run argparse to get a chance at '-h'.  When
lacking arguments, always use print_help() to provide detail rather than usage.
2017-01-06 13:28:28 -05:00
Jarrod Johnson 5ffc2c298b Correct mixup of parentheses and brackets 2017-01-04 09:56:31 -05:00
Jarrod Johnson 7bf8242aba Assign self.ipmicmd in case we are reusing an existing object that is already logged. 2017-01-04 09:45:19 -05:00