Commit 1c382a57 authored by Leigh Stoller's avatar Leigh Stoller

Fixes to previous revision from Mike.

parent ea8661b8
...@@ -100,14 +100,16 @@ bootinfo(struct in_addr ipaddr, char *node_id, struct boot_info *boot_info, ...@@ -100,14 +100,16 @@ bootinfo(struct in_addr ipaddr, char *node_id, struct boot_info *boot_info,
case BIOPCODE_BOOTWHAT_KEYED_REQUEST: case BIOPCODE_BOOTWHAT_KEYED_REQUEST:
info("%s: KEYED REQUEST (key=[%s], vers %d)\n", info("%s: KEYED REQUEST (key=[%s], vers %d)\n",
inet_ntoa(ipaddr), boot_info->data, boot_info->version); inet_ntoa(ipaddr), boot_info->data, boot_info->version);
#if defined(EVENTSYS) && defined(BOOTINFO_PXEEVENTS) #ifdef EVENTSYS
needevent = bicache_needevent(ipaddr); needevent = bicache_needevent(ipaddr);
#if defined(BOOTINFO_PXEEVENTS)
if (!no_event_send && needevent && if (!no_event_send && needevent &&
bievent_send(ipaddr, opaque, TBDB_NODESTATE_PXEBOOTING)) { bievent_send(ipaddr, opaque, TBDB_NODESTATE_PXEBOOTING)) {
/* send failed, clear the cache entry */ /* send failed, clear the cache entry */
bicache_clearevent(ipaddr); bicache_clearevent(ipaddr);
eventfailed = 1; eventfailed = 1;
} }
#endif
#endif #endif
err = query_bootinfo_db(ipaddr, node_id, boot_info->version, err = query_bootinfo_db(ipaddr, node_id, boot_info->version,
boot_whatp, boot_info->data); boot_whatp, boot_info->data);
...@@ -116,14 +118,16 @@ bootinfo(struct in_addr ipaddr, char *node_id, struct boot_info *boot_info, ...@@ -116,14 +118,16 @@ bootinfo(struct in_addr ipaddr, char *node_id, struct boot_info *boot_info,
case BIOPCODE_BOOTWHAT_INFO: case BIOPCODE_BOOTWHAT_INFO:
info("%s: REQUEST (vers %d)\n", info("%s: REQUEST (vers %d)\n",
inet_ntoa(ipaddr), boot_info->version); inet_ntoa(ipaddr), boot_info->version);
#if defined(EVENTSYS) && defined(BOOTINFO_PXEEVENTS) #ifdef EVENTSYS
needevent = bicache_needevent(ipaddr); needevent = bicache_needevent(ipaddr);
#if defined(BOOTINFO_PXEEVENTS)
if (!no_event_send && needevent && if (!no_event_send && needevent &&
bievent_send(ipaddr, opaque, TBDB_NODESTATE_PXEBOOTING)) { bievent_send(ipaddr, opaque, TBDB_NODESTATE_PXEBOOTING)) {
/* send failed, clear the cache entry */ /* send failed, clear the cache entry */
bicache_clearevent(ipaddr); bicache_clearevent(ipaddr);
eventfailed = 1; eventfailed = 1;
} }
#endif
#endif #endif
err = query_bootinfo_db(ipaddr, node_id, err = query_bootinfo_db(ipaddr, node_id,
boot_info->version, boot_whatp, NULL); boot_info->version, boot_whatp, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment