Skip to content

CFE-3366: gate storage promise fstab edits and mount point creation on the promise action #6344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickanderson wants to merge 2 commits into
base: master
Choose a base branch
from
+56 −20
Open

CFE-3366: gate storage promise fstab edits and mount point creation on the promise action #6344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
966c5c7
Stopped /etc/fstab edits when action_policy is warn
nickanderson Sep 2, 2026
30c9b3e
Stopped storage promises from creating mount points in dry-run or war…
nickanderson Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 38 additions & 13 deletions cf-agent/nfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,12 +744,21 @@ int VerifyInFstab(EvalContext *ctx, char *name, const Attributes *a, const Promi
if (!MatchFSInFstab(mountpt))
{
/* CFE-90: Entry not in fstab - add it */
AppendItem(&FSTABLIST, fstab, NULL);
FSTAB_EDITS++;
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a, "Adding file system entry '%s' to '%s'", fstab,
VFSTAB[VSYSTEMHARDCLASS]);
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
changes += 1;
/* CFE-3366: gate the edit on the promise action, not just DONTDO. The
* file system table is part of the system, so a dry-run (or
* action_policy => "warn") promise must report the edit it would make
* and leave the table alone. */
if (MakingInternalChanges(ctx, pp, a, result,
"add file system entry '%s' to '%s'",
fstab, VFSTAB[VSYSTEMHARDCLASS]))
{
AppendItem(&FSTABLIST, fstab, NULL);
FSTAB_EDITS++;
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a, "Adding file system entry '%s' to '%s'", fstab,
VFSTAB[VSYSTEMHARDCLASS]);
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
changes += 1;
}
}
else
{
Expand All @@ -764,13 +773,19 @@ int VerifyInFstab(EvalContext *ctx, char *name, const Attributes *a, const Promi
char *existing_opts = GetFstabEntryOptions(mountpt);
if (existing_opts != NULL && !StringEqual(existing_opts, opts))
{
/* Replace the entire fstab entry with the corrected options */
ReplaceFstabEntry(FSTABLIST, mountpt, fstab);
FSTAB_EDITS++;
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a, "Updating file system entry for '%s' in '%s' (options: '%s' -> '%s')",
mountpt, VFSTAB[VSYSTEMHARDCLASS], existing_opts, opts);
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
changes += 1;
/* CFE-3366: gate the rewrite on the promise action - see above. */
if (MakingInternalChanges(ctx, pp, a, result,
"update the file system entry for '%s' in '%s' (options: '%s' -> '%s')",
mountpt, VFSTAB[VSYSTEMHARDCLASS], existing_opts, opts))
{
/* Replace the entire fstab entry with the corrected options */
ReplaceFstabEntry(FSTABLIST, mountpt, fstab);
FSTAB_EDITS++;
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a, "Updating file system entry for '%s' in '%s' (options: '%s' -> '%s')",
mountpt, VFSTAB[VSYSTEMHARDCLASS], existing_opts, opts);
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
changes += 1;
}
}
free(existing_opts);
}
Expand Down Expand Up @@ -808,6 +823,16 @@ int VerifyNotInFstab(EvalContext *ctx, char *name, const Attributes *a, const Pr
{
if (a->mount.editfstab)
{
/* CFE-3366: gate the removal on the promise action, not just
* DONTDO, so a dry-run (or action_policy => "warn") promise reports
* the entry it would remove and leaves the table alone. Returning
* early keeps the platform-specific removal below unindented. */
if (!MakingInternalChanges(ctx, pp, a, result,
"remove the file system entry for '%s' from '%s'",
mountpt, VFSTAB[VSYSTEMHARDCLASS]))
{
return 0;
}
#if defined(_AIX)
FILE *pfp;
char aixcomm[CF_BUFSIZE];
Expand Down
25 changes: 18 additions & 7 deletions cf-agent/verify_storage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,14 +512,25 @@ static PromiseResult VerifyMountPromise(EvalContext *ctx, char *name, const Attr
if (!a->mount.unmount)
{
/* Ensure the mount point exists before mounting or remounting.
* dir is "<name>/.", so this creates the mount point directory. */
if (!MakeParentDirectory(dir, a->move_obstructions, NULL))
* dir is "<name>/.", so this creates the mount point directory.
*
* CFE-3366: creating it is a change to the system, so gate it on the
* promise action. The existence check comes first so that a promise
* whose mount point is already there does not warn about a directory
* it would not have created anyway. */
struct stat mount_point_sb;
if ((stat(name, &mount_point_sb) == -1)
&& MakingInternalChanges(ctx, pp, a, &result,
"create mount point '%s'", name))
{
// Could not create parent directory, assume this is okay,
// verbose logging in MakeParentDirectory()
Log(LOG_LEVEL_DEBUG,
"Could not create parent directory '%s' for mount promise",
dir);
if (!MakeParentDirectory(dir, a->move_obstructions, NULL))
{
// Could not create parent directory, assume this is okay,
// verbose logging in MakeParentDirectory()
Log(LOG_LEVEL_DEBUG,
"Could not create parent directory '%s' for mount promise",
dir);
}
}

if (already_mounted)
Expand Down
Loading