Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 144808 Details for
Bug 210482
RFE: flag for clusvcadm to respect failover domain priorities
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Implements behavior
rgmanager-rhel4-fdenable.patch (text/plain), 7.29 KB, created by
Lon Hohberger
on 2007-01-04 15:46:33 UTC
(
hide
)
Description:
Implements behavior
Filename:
MIME Type:
Creator:
Lon Hohberger
Created:
2007-01-04 15:46:33 UTC
Size:
7.29 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P cluster-RHEL4 >Index: rgmanager/src/daemons/rg_state.c >=================================================================== >RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/rg_state.c,v >retrieving revision 1.4.2.17 >diff -u -r1.4.2.17 rg_state.c >--- rgmanager/src/daemons/rg_state.c 13 Dec 2006 18:19:56 -0000 1.4.2.17 >+++ rgmanager/src/daemons/rg_state.c 4 Jan 2007 15:42:34 -0000 >@@ -1258,6 +1258,60 @@ > } > > >+int >+handle_fd_start_req(char *svcName, int request, uint64_t *new_owner) >+{ >+ cluster_member_list_t *allowed_nodes, *backup = NULL; >+ uint64_t target, me = my_id(); >+ int ret, x; >+ >+ allowed_nodes = member_list(); >+ >+ while (memb_count(allowed_nodes)) { >+ target = best_target_node(allowed_nodes, NODE_ID_NONE, >+ svcName, 1); >+ if (target == me) { >+ ret = handle_start_remote_req(svcName, request); >+ } else { >+ ret = relocate_service(svcName, request, target); >+ } >+ >+ switch (ret) { >+ case RG_ERUN: >+ return RG_ERUN; >+ case RG_EFAIL: >+ memb_mark_down(allowed_nodes, target); >+ continue; >+ case RG_EABORT: >+ svc_report_failure(svcName); >+ cml_free(allowed_nodes); >+ return FAIL; >+ case NO: >+ /* state uncertain */ >+ cml_free(allowed_nodes); >+ clulog(LOG_DEBUG, "State Uncertain: svc:%s " >+ "nid:%08x%08x req:%d\n", svcName, >+ (uint32_t)(target>>32)&0xffffffff, >+ (uint32_t)(target&0xffffffff), request); >+ return 0; >+ case 0: >+ *new_owner = target; >+ clulog(LOG_NOTICE, "Service %s is now running " >+ "on member %d\n", svcName, (int)target); >+ cml_free(allowed_nodes); >+ return 0; >+ default: >+ clulog(LOG_ERR, >+ "#61: Invalid reply from member %d during" >+ " relocate operation!\n", target); >+ } >+ } >+ >+ cml_free(allowed_nodes); >+ return RG_EFAIL; >+} >+ >+ > /** > * handle_start_req - Handle a generic start request from a user or during > * service manager boot. >@@ -1393,11 +1447,14 @@ > } > cml_free(membership); > >- if (svc_start(svcName, req) == 0) >+ x = svc_start(svcName, req); >+ if (x == 0) > return 0; >+ if (x == RG_ERUN) >+ return RG_ERUN; > > if (svc_stop(svcName, RG_STOP_RECOVER) == 0) >- return FAIL; >+ return RG_EFAIL; > > svc_fail(svcName); > return RG_EABORT; >Index: rgmanager/src/daemons/rg_thread.c >=================================================================== >RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/rg_thread.c,v >retrieving revision 1.7.2.8 >diff -u -r1.7.2.8 rg_thread.c >--- rgmanager/src/daemons/rg_thread.c 13 Dec 2006 18:19:56 -0000 1.7.2.8 >+++ rgmanager/src/daemons/rg_thread.c 4 Jan 2007 15:42:34 -0000 >@@ -237,8 +237,15 @@ > > case RG_START: > case RG_ENABLE: >- error = handle_start_req(myname, req->rr_request, >- &newowner); >+ if (req->rr_arg0) { >+ error = handle_fd_start_req(myname, >+ req->rr_request, >+ &newowner); >+ } else { >+ error = handle_start_req(myname, >+ req->rr_request, >+ &newowner); >+ } > break; > > case RG_RELOCATE: >Index: rgmanager/src/daemons/nodeevent.c >=================================================================== >RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/nodeevent.c,v >retrieving revision 1.1.2.2 >diff -u -r1.1.2.2 nodeevent.c >--- rgmanager/src/daemons/nodeevent.c 21 Jun 2006 18:34:19 -0000 1.1.2.2 >+++ rgmanager/src/daemons/nodeevent.c 4 Jan 2007 15:42:33 -0000 >@@ -36,7 +36,6 @@ > static nevent_t *event_queue = NULL; > static pthread_mutex_t ne_queue_mutex = PTHREAD_MUTEX_INITIALIZER; > static pthread_t ne_thread = 0; >-int ne_queue_request(int local, uint64_t nodeid, int state); > > > void * >Index: rgmanager/src/daemons/main.c >=================================================================== >RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/main.c,v >retrieving revision 1.9.2.21 >diff -u -r1.9.2.21 main.c >--- rgmanager/src/daemons/main.c 13 Dec 2006 18:19:56 -0000 1.9.2.21 >+++ rgmanager/src/daemons/main.c 4 Jan 2007 15:42:33 -0000 >@@ -432,7 +432,9 @@ > /* Queue request */ > rt_enqueue_request(msg_sm.sm_data.d_svcName, > msg_sm.sm_data.d_action, >- fd, 0, msg_sm.sm_data.d_svcOwner, 0, 0); >+ fd, 0, msg_sm.sm_data.d_svcOwner, >+ msg_sm.sm_hdr.gh_arg1, >+ msg_sm.sm_hdr.gh_arg2); > break; > > case RG_EXITING: >Index: rgmanager/init.d/rgmanager >=================================================================== >RCS file: /cvs/cluster/cluster/rgmanager/init.d/rgmanager,v >retrieving revision 1.3.2.4 >diff -u -r1.3.2.4 rgmanager >--- rgmanager/init.d/rgmanager 13 Dec 2006 18:19:56 -0000 1.3.2.4 >+++ rgmanager/init.d/rgmanager 4 Jan 2007 15:42:33 -0000 >@@ -100,7 +100,7 @@ > echo > > # To be consistent... >- if [ $ret -eq 0 ]; then >+ if [ $rv -eq 0 ]; then > touch /var/lock/subsys/rgmanager > fi > exit $rv >Index: rgmanager/src/utils/clusvcadm.c >=================================================================== >RCS file: /cvs/cluster/cluster/rgmanager/src/utils/clusvcadm.c,v >retrieving revision 1.2.2.8 >diff -u -r1.2.2.8 clusvcadm.c >--- rgmanager/src/utils/clusvcadm.c 3 Jan 2007 21:08:17 -0000 1.2.2.8 >+++ rgmanager/src/utils/clusvcadm.c 4 Jan 2007 15:42:34 -0000 >@@ -37,11 +37,14 @@ > > > void >-build_message(SmMessageSt *msgp, int action, char *svcName, uint64_t target) >+build_message(SmMessageSt *msgp, int action, char *svcName, uint64_t target, >+ uint32_t arg1, uint32_t arg2) > { > msgp->sm_hdr.gh_magic = GENERIC_HDR_MAGIC; > msgp->sm_hdr.gh_command = RG_ACTION_REQUEST; > msgp->sm_hdr.gh_length = sizeof(*msgp); >+ msgp->sm_hdr.gh_arg1 = arg1; >+ msgp->sm_hdr.gh_arg2 = arg2; > msgp->sm_data.d_action = action; > strncpy(msgp->sm_data.d_svcName, svcName, > sizeof(msgp->sm_data.d_svcName)); >@@ -192,6 +195,8 @@ > printf(" %s -d <group> Disable <group>\n", name); > printf(" %s -e <group> Enable <group> on the local node\n", > name); >+printf(" %s -e <group> -F Enable <group> according to failover\n" >+ " domain rules\n", name); > printf(" %s -e <group> -m <member> Enable <group>" > " on <member>\n", name); > printf(" %s -r <group> -m <member> Relocate <group> [to <member>]\n", >@@ -219,7 +224,7 @@ > extern char *optarg; > char *svcname=NULL, nodename[256]; > int opt; >- int msgfd = -1, fd; >+ int msgfd = -1, fd, fod = 0; > SmMessageSt msg; > int action = RG_STATUS; > int node_specified = 0; >@@ -232,7 +237,7 @@ > return 1; > } > >- while ((opt = getopt(argc, argv, "lSue:d:r:n:m:vR:s:qh?")) != EOF) { >+ while ((opt = getopt(argc, argv, "lSue:d:r:Fn:m:vR:s:qh?")) != EOF) { > switch (opt) { > case 'l': > return do_lock(); >@@ -249,6 +254,14 @@ > action = RG_ENABLE; > svcname = optarg; > break; >+ case 'F': >+ if (node_specified) { >+ fprintf(stderr, >+ "Cannot use '-F' with '-n' or '-m'\n"); >+ return 1; >+ } >+ fod = 1; >+ break; > case 'd': > /* DISABLE */ > actionstr = "disabling"; >@@ -274,7 +287,11 @@ > break; > case 'm': /* member ... */ > case 'n': /* node .. same thing */ >- >+ if (fod) { >+ fprintf(stderr, >+ "Cannot use '-F' with '-n' or '-m'\n"); >+ return 1; >+ } > strncpy(nodename,optarg,sizeof(nodename)); > node_specified = 1; > break; >@@ -322,7 +339,7 @@ > sizeof(nodename)); > } > >- build_message(&msg, action, svcname, svctarget); >+ build_message(&msg, action, svcname, svctarget, fod, 0); > > if (action != RG_RELOCATE) { > printf("Member %s %s %s", nodename, actionstr, svcname);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 210482
: 144808