Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
packages
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
infra
packages
Commits
41cc8ea2
Commit
41cc8ea2
authored
2 years ago
by
Ciarán McKenna
Browse files
Options
Downloads
Patches
Plain Diff
Remove rbd cache support
parent
4ef2a783
No related branches found
No related tags found
No related merge requests found
Pipeline
#4210
passed with warnings
2 years ago
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
patches/ganeti/add_rbd_cache_support.patch
+0
-20
0 additions, 20 deletions
patches/ganeti/add_rbd_cache_support.patch
with
0 additions
and
20 deletions
patches/ganeti/add_rbd_cache_support.patch
deleted
100644 → 0
+
0
−
20
View file @
4ef2a783
Index: ganeti-3.0.1/lib/hypervisor/hv_kvm/__init__.py
===================================================================
--- ganeti-3.0.1.orig/lib/hypervisor/hv_kvm/__init__.py
+++ ganeti-3.0.1/lib/hypervisor/hv_kvm/__init__.py
@@ -921,12 +921,13 @@
class KVMHypervisor(hv_base.BaseHypervis
disk_cache = up_hvp[constants.HV_DISK_CACHE]
for cfdev, link_name, uri in kvm_disks:
if cfdev.dev_type in constants.DTS_EXT_MIRROR:
- if disk_cache != "none":
+ if disk_cache != "none" and cfdev.dev_type != "rbd":
# TODO: make this a hard error, instead of a silent overwrite
logging.warning("KVM: overriding disk_cache setting '%s' with 'none'"
" to prevent shared storage corruption on migration",
disk_cache)
- cache_val = ",cache=none"
+ disk_cache = "none"
+ cache_val = ",cache=%s" % disk_cache
elif disk_cache != constants.HT_CACHE_DEFAULT:
cache_val = ",cache=%s" % disk_cache
else:
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment