42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
|
From 1e041fdfb09bfc39aa37bea7d491bcf56794fa1c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||
|
|
Date: Tue, 11 Feb 2014 10:54:23 -0600
|
||
|
|
Subject: [PATCH] Auto setup pcmk stack as default if no stack is setup
|
||
|
|
|
||
|
|
Note: This changes the default behavior from classic stack to pcmk
|
||
|
|
---
|
||
|
|
libo2cb/o2cb_abi.c | 9 +++++++--
|
||
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libo2cb/o2cb_abi.c b/libo2cb/o2cb_abi.c
|
||
|
|
index 5e0c4fb..26ea03e 100644
|
||
|
|
--- a/libo2cb/o2cb_abi.c
|
||
|
|
+++ b/libo2cb/o2cb_abi.c
|
||
|
|
@@ -172,7 +172,9 @@ static errcode_t determine_stack(void)
|
||
|
|
ssize_t len;
|
||
|
|
char line[100];
|
||
|
|
errcode_t err = O2CB_ET_SERVICE_UNAVAILABLE;
|
||
|
|
+ int setup_performed = 0;
|
||
|
|
|
||
|
|
+redo:
|
||
|
|
len = read_stack_file(line, sizeof(line));
|
||
|
|
if (len > 0) {
|
||
|
|
if (line[len - 1] == '\n') {
|
||
|
|
@@ -192,8 +194,11 @@ static errcode_t determine_stack(void)
|
||
|
|
err = 0;
|
||
|
|
}
|
||
|
|
} else if (len == -ENOENT) {
|
||
|
|
- current_stack = &classic_stack;
|
||
|
|
- err = 0;
|
||
|
|
+ if (!setup_performed) {
|
||
|
|
+ o2cb_setup_stack(OCFS2_PCMK_CLUSTER_STACK);
|
||
|
|
+ setup_performed = 1;
|
||
|
|
+ goto redo;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
return err;
|
||
|
|
--
|
||
|
|
1.8.4
|
||
|
|
|