rpms/iscsi-initiator-utils/F-13 iscsi-initiator-utils-log-info.patch, NONE, 1.1 iscsi-initiator-utils.spec, 1.50, 1.51 iscsidevs.init, 1.6, 1.7
Mike Christie
michaelc at fedoraproject.org
Thu May 6 21:15:59 UTC 2010
Author: michaelc
Update of /cvs/pkgs/rpms/iscsi-initiator-utils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3388
Modified Files:
iscsi-initiator-utils.spec iscsidevs.init
Added Files:
iscsi-initiator-utils-log-info.patch
Log Message:
Fix iscsi init script failures
iscsi-initiator-utils-log-info.patch:
log.c | 21 +++++++++++++++++----
log.h | 2 ++
session_mgmt.c | 38 +++++++++++++++++++-------------------
3 files changed, 38 insertions(+), 23 deletions(-)
--- NEW FILE iscsi-initiator-utils-log-info.patch ---
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/log.c open-iscsi-2.0-872-rc1-bnx2i.work/usr/log.c
--- open-iscsi-2.0-872-rc1-bnx2i/usr/log.c 2010-05-06 15:26:01.000000000 -0500
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/log.c 2010-05-06 15:51:47.000000000 -0500
@@ -281,10 +281,15 @@ void log_do_log_daemon(int prio, void *p
void log_do_log_stderr(int prio, void *priv, const char *fmt, va_list ap)
{
- fprintf(stderr, "%s: ", log_name);
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, "\n");
- fflush(stderr);
+ if (prio == LOG_INFO) {
+ vfprintf(stdout, fmt, ap);
+ fprintf(stdout, "\n");
+ } else {
+ fprintf(stderr, "%s: ", log_name);
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+ fflush(stderr);
+ }
}
void log_warning(const char *fmt, ...)
@@ -313,6 +318,14 @@ void log_debug(int level, const char *fm
}
}
+void log_info(const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ log_func(LOG_INFO, log_func_priv, fmt, ap);
+ va_end(ap);
+}
+
static void __dump_line(int level, unsigned char *buf, int *cp)
{
char line[16*3+5], *lp = line;
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/log.h open-iscsi-2.0-872-rc1-bnx2i.work/usr/log.h
--- open-iscsi-2.0-872-rc1-bnx2i/usr/log.h 2010-05-06 15:26:01.000000000 -0500
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/log.h 2010-05-06 15:39:58.000000000 -0500
@@ -71,6 +71,8 @@ extern int log_init(char *program_name,
void *priv);
extern void log_close (pid_t pid);
extern void dump_logmsg (void *);
+extern void log_info(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2)));
extern void log_warning(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2)));
extern void log_error(const char *fmt, ...)
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/session_mgmt.c open-iscsi-2.0-872-rc1-bnx2i.work/usr/session_mgmt.c
--- open-iscsi-2.0-872-rc1-bnx2i/usr/session_mgmt.c 2010-05-06 15:26:01.000000000 -0500
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/session_mgmt.c 2010-05-06 15:43:28.000000000 -0500
@@ -42,10 +42,10 @@ static void log_login_msg(struct node_re
rec->conn[0].port);
iscsid_handle_error(rc);
} else
- log_warning("Login to [iface: %s, target: %s, portal: "
- "%s,%d] successful.", rec->iface.name,
- rec->name, rec->conn[0].address,
- rec->conn[0].port);
+ log_info("Login to [iface: %s, target: %s, portal: "
+ "%s,%d] successful.", rec->iface.name,
+ rec->name, rec->conn[0].address,
+ rec->conn[0].port);
}
struct iscsid_async_req {
@@ -100,15 +100,15 @@ int iscsi_login_portal(void *data, struc
struct iscsid_async_req *async_req = NULL;
int rc = 0, fd;
- log_warning("Logging in to [iface: %s, target: %s, portal: %s,%d]",
- rec->iface.name, rec->name, rec->conn[0].address,
- rec->conn[0].port);
+ log_info("Logging in to [iface: %s, target: %s, portal: %s,%d]",
+ rec->iface.name, rec->name, rec->conn[0].address,
+ rec->conn[0].port);
if (list) {
async_req = calloc(1, sizeof(*async_req));
if (!async_req)
- log_error("Could not allocate memory for async login "
- "handling. Using sequential login instead.");
+ log_info("Could not allocate memory for async login "
+ "handling. Using sequential login instead.");
else
INIT_LIST_HEAD(&async_req->list);
}
@@ -215,10 +215,10 @@ static void log_logout_msg(struct sessio
info->persistent_address, info->port);
iscsid_handle_error(rc);
} else
- log_warning("Logout of [sid: %d, target: %s, "
- "portal: %s,%d] successful.",
- info->sid, info->targetname,
- info->persistent_address, info->port);
+ log_info("Logout of [sid: %d, target: %s, "
+ "portal: %s,%d] successful.",
+ info->sid, info->targetname,
+ info->persistent_address, info->port);
}
static int iscsid_logout_reqs_wait(struct list_head *list)
@@ -252,16 +252,16 @@ int iscsi_logout_portal(struct session_i
int fd, rc;
/* TODO: add fn to add session prefix info like dev_printk */
- log_warning("Logging out of session [sid: %d, target: %s, portal: "
- "%s,%d]",
- info->sid, info->targetname, info->persistent_address,
- info->port);
+ log_info("Logging out of session [sid: %d, target: %s, portal: "
+ "%s,%d]",
+ info->sid, info->targetname, info->persistent_address,
+ info->port);
if (list) {
async_req = calloc(1, sizeof(*async_req));
if (!async_req)
- log_error("Could not allocate memory for async logout "
- "handling. Using sequential logout instead.");
+ log_info("Could not allocate memory for async logout "
+ "handling. Using sequential logout instead.");
}
if (!async_req)
Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-13/iscsi-initiator-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- iscsi-initiator-utils.spec 6 May 2010 19:54:14 -0000 1.50
+++ iscsi-initiator-utils.spec 6 May 2010 21:15:59 -0000 1.51
@@ -3,7 +3,7 @@
Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils
Version: 6.2.0.872
-Release: 3%{?dist}
+Release: 4%{?dist}
Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc1-bnx2i.tar.gz
Source1: iscsid.init
Source2: iscsidevs.init
@@ -26,6 +26,8 @@ Patch6: iscsi-initiator-utils-disable-is
Patch7: iscsi-initiator-utils-fix-zero-MaxXmitDataSegmentLength.patch
# fix initial r2t handling for be2iscsi
Patch8: iscsi-initiator-utils-be2iscsi-fix-init-r2t.patch
+# do not send informational msgs to stderr
+Patch9: iscsi-initiator-utils-log-info.patch
Group: System Environment/Daemons
@@ -64,6 +66,7 @@ developing applications that use %{name}
%patch6 -p1 -b .disable-isns-for-lib
%patch7 -p1 -b .fix-zero-MaxXmitDataSegmentLength
%patch8 -p1 -b .be2iscsi-fix-init-r2t
+%patch9 -p1 -b .log-info
%build
cd utils/open-isns
@@ -176,6 +179,10 @@ fi
%{_includedir}/libiscsi.h
%changelog
+* Thu May 6 2010 Mike Christie <mchristi at redhat.com> 6.2.0.872.4
+- Fix iscsi script operations to check for offload drivers in rh_status
+- Fix iscsiadm logging to not trigger iscsi script error detection
+
* Wed May 5 2010 Mike Christie <mchristi at redhat.com> 6.2.0.872.3
- 578455 Fix initial R2T=0 handling for be2iscsi
Index: iscsidevs.init
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-13/iscsidevs.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- iscsidevs.init 30 Sep 2008 12:21:47 -0000 1.6
+++ iscsidevs.init 6 May 2010 21:15:59 -0000 1.7
@@ -98,7 +98,7 @@ force_reload() {
rh_status() {
[ -f $lockfile ] || return 3
- declare -a iparams=( $(iscsiadm -m session 2>/dev/null | egrep "tcp|iser") )
+ declare -a iparams=( $(iscsiadm -m session 2>/dev/null | egrep "tcp|iser|bnx2i|be2iscsi|cxgb3i") )
if [[ -z "${iparams[*]}" ]]; then
# no sessions
return 2
More information about the scm-commits
mailing list