From 8e5a705d239f0d3740a6d539ae8e9d9d12115615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Wed, 19 Oct 2011 16:51:27 +0200
Subject: [PATCH] Fix queue archive creation with wrong permissions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
On a master failover some of the archive dirs might have wrong
permissions in the non-root model. This is due to the nature of noded
still running as root and the job queue is synced that way. This patch
will fix this behaviour by setting the permissions accordingly.
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/backend.py | 5 ++++-
lib/utils/io.py | 12 ++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index a3c3fa16f..fb1ed0c7a 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -2576,7 +2576,10 @@ def JobQueueRename(old, new):
_EnsureJobQueueFile(old)
_EnsureJobQueueFile(new)
- utils.RenameFile(old, new, mkdir=True)
+ getents = runtime.GetEnts()
+
+ utils.RenameFile(old, new, mkdir=True, mkdir_mode=0700,
+ dir_uid=getents.masterd_uid, dir_gid=getents.masterd_gid)
def BlockdevClose(instance_name, disks):
diff --git a/lib/utils/io.py b/lib/utils/io.py
index 08c99908b..8ed204ccf 100644
--- a/lib/utils/io.py
+++ b/lib/utils/io.py
@@ -290,7 +290,8 @@ def RemoveDir(dirname):
raise
-def RenameFile(old, new, mkdir=False, mkdir_mode=0750):
+def RenameFile(old, new, mkdir=False, mkdir_mode=0750, dir_uid=None,
+ dir_gid=None):
"""Renames a file.
@type old: string
@@ -301,6 +302,10 @@ def RenameFile(old, new, mkdir=False, mkdir_mode=0750):
@param mkdir: Whether to create target directory if it doesn't exist
@type mkdir_mode: int
@param mkdir_mode: Mode for newly created directories
+ @type dir_uid: int
+ @param dir_uid: The uid for the (if fresh created) dir
+ @type dir_gid: int
+ @param dir_gid: The gid for the (if fresh created) dir
"""
try:
@@ -311,7 +316,10 @@ def RenameFile(old, new, mkdir=False, mkdir_mode=0750):
# as efficient.
if mkdir and err.errno == errno.ENOENT:
# Create directory and try again
- Makedirs(os.path.dirname(new), mode=mkdir_mode)
+ dir_path = os.path.dirname(new)
+ Makedirs(dir_path, mode=mkdir_mode)
+ if not (dir_uid is None or dir_gid is None):
+ os.chown(dir_path, dir_uid, dir_gid)
return os.rename(old, new)
--
GitLab