2:39 p.m.
Patch set does not apply:
alinefm@alinefm:~/kimchi$ git am -3 ../mail-patches/\[PATCH\ *
Applying: Fix 'disk full' issue: Change objectstore exception handling
Applying: Fix 'disk full' issue: Fix Templates db store/delete error
handling
Applying: Fix 'disk full' issue: Fix storage volume error handling
Applying: Fix 'disk full' issue: Fix storagepool and asynctasks error
handling
Applying: Fix 'disk full' issue: Fix vms/screenshot db store/delete
error handling
Applying: Fix PEP8 minor issues in multiple files
fatal: sha1 information is lacking or useless (src/kimchi/control/host.py).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0006 Fix PEP8 minor issues in multiple files
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
alinefm@alinefm:~/kimchi$ git mergetool
merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff tortoisemerge
gvimdiff diffuse ecmerge p4merge araxis bc3 vimdiff emerge
No files need merging
Also do not send a separated patch to fix pep8 in the files you changed
in previous commit.
Join the pep8 fixes to the commit you broke the pep8 rules.
On 04/02/2014 04:15 PM, Rodrigo Trujillo wrote:
V4:
- Fix pep8 issues
V3:
- Fix issues with tests
- Rebase with 1.2
V2:
Address Aline's comments:
- Change error message
- Aggregate 'if's
V1:
If the disk where objectstore (Kimchi database) is full, then a lot of
errors will be raised without any special treatment. This can lead the
system to an unexpected state.
This patchset modifies kimchi in order to give the right treatment to
exceptions, showing the error to the user or hidding when possible.
Rodrigo Trujillo (6):
Fix 'disk full' issue: Change objectstore exception handling
Fix 'disk full' issue: Fix Templates db store/delete error handling
Fix 'disk full' issue: Fix storage volume error handling
Fix 'disk full' issue: Fix storagepool and asynctasks error handling
Fix 'disk full' issue: Fix vms/screenshot db store/delete error
handling
Fix PEP8 minor issues in multiple files
src/kimchi/asynctask.py | 7 ++--
src/kimchi/control/host.py | 1 +
src/kimchi/i18n.py | 5 +++
src/kimchi/model/storagepools.py | 7 ++--
src/kimchi/model/storagevolumes.py | 49 +++++++++++++++++----------
src/kimchi/model/templates.py | 27 +++++++++++----
src/kimchi/model/vms.py | 69 +++++++++++++++++++++++++++-----------
src/kimchi/objectstore.py | 7 ++++
8 files changed, 124 insertions(+), 48 deletions(-)