Online target database?
|
View:
New views
12 Messages
—
Rating Filter:
Alert me
|
 |
Online target database?
by Jeff Waller
::
Rate this Message:
|
|
|
Re: Online target database?
by Marcel Ritter
::
Rate this Message:
Jeff Waller schrieb:
> Reading the man page of ietadm, I find that ietadm will change the state of > the iet daemon, but > that information will not be persistent. It's one of the known issues. > > Searching the archive, there's been a couple of suggestions along these > lines, but has there been > anything concretely done? Has there been any discussion about making the > daemon use a more > online database (e.g. dbm) and it being the conduit for ietadm modifying > that? > > -Jeff > I've started to implement this, but it's not finished yet. However I don't like the idea of databases to store this information. open-iscsi for example uses the god old unix fashion "everything is a file" - and stores all information in nice little plain text files (everyone can edit with his favourite vi/emacs/whatever). So that's the way I'm doing it. As most users on linux will use open-iscsi as initiator (and iscsitarget as target), I think it's nice to have a similar way to configure iscsi on both sides. For now you'll have to create 3 extra directories in order to make this version work: /etc/ietd.d/ /etc/ietd.d/targets /etc/ietd.d/tids What I've done so far: - Added code to save changed settings * users * targets * luns * global settings: only partially Still to do: - clean up global option parsing/handling - read config files to restore iscsi settings on restart - cleanups ... - lots more (I guess) I've attached the patch - but please consider this work in progress. Bye, Marcel -- ---- Dipl.-Inf. Marcel Ritter Linux/Novell Regionales Rechenzentrum Erlangen Tel: 09131 / 85-27808 E-Mail: Marcel.Ritter@... ---- Unix _IS_ user friendly... It's just selective about who its friends are. diff -Nur iscsitarget-0.4.16.orig/usr/iscsid.h iscsitarget-0.4.16/usr/iscsid.h --- iscsitarget-0.4.16.orig/usr/iscsid.h 2008-03-18 07:41:02.000000000 +0100 +++ iscsitarget-0.4.16/usr/iscsid.h 2008-06-17 13:04:16.000000000 +0200 @@ -125,6 +125,7 @@ struct qelem tlist; struct qelem sessions_list; + struct qelem lun_list; u32 tid; char name[ISCSI_NAME_LEN]; diff -Nur iscsitarget-0.4.16.orig/usr/lun.c iscsitarget-0.4.16/usr/lun.c --- iscsitarget-0.4.16.orig/usr/lun.c 1970-01-01 01:00:00.000000000 +0100 +++ iscsitarget-0.4.16/usr/lun.c 2008-06-17 13:04:16.000000000 +0200 @@ -0,0 +1,172 @@ +/* + * Released under the terms of the GNU GPL v2.0. + */ + +#include <ctype.h> +#include <dirent.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/stat.h> +#include <errno.h> + +#include "iscsid.h" +#include "lun.h" + + +struct match_table_t iomode[] = { + {Mode_fileio, "fileio"}, + {Mode_blockio, "blockio"}, + {Mode_nullio, "nullio"}, + {Mode_unknownio, NULL}, +}; + +struct match_table_t tokens[] = { + {Opt_scsiid, "ScsiId="}, + {Opt_scsisn, "ScsiSN="}, + {Opt_path, "Path="}, + {Opt_type, "Type="}, + {Opt_iomode, "IOMode="}, + {Opt_err, NULL}, +}; + +struct qelem luns = LIST_HEAD_INIT(luns); + + +int is_token(char *tokenstr) +{ + int i; + + for (i=0; i<Opt_err; i++) + if (strncmp(tokenstr, tokens[i].tokenstr,strlen(tokens[i].tokenstr)) == 0) + return i; + return -1; +} + +char* get_token_value(char *tokenstr) +{ + char *sep; + + sep = index(tokenstr, '='); + if (sep) + sep += 1; + return(sep); +} + +struct lun* parse_lun_args(char *args, struct lun *newlun) +{ + char *argcopy, *end, *val; + int start=0, tok; + int arglen = strlen(args); + int i, len; + + argcopy = malloc(arglen+1); + strncpy(argcopy, args, arglen+1); + + log_debug(1, "parse_lun_args: %s", args); + while (start < arglen) { + if ((end = index(argcopy+start, ','))==NULL) + end = argcopy+arglen; + else + *end = '\0'; + if (start < arglen) { + log_debug(1, " arg: %s", argcopy+start); + if ((tok = is_token(argcopy+start)) >= 0) { + log_debug(1, "Detected: %s", tokens[tok].tokenstr); + val = get_token_value(argcopy+start); + log_debug(1, "%s", val); + switch(tok) { + case(Opt_scsiid): + len = (SCSI_ID_LEN > strlen(val)) ? strlen(val) : SCSI_ID_LEN; + strncpy(newlun->scsiid, val, len+1); + break; + case(Opt_scsisn): + len = (SCSI_SN_LEN > strlen(val)) ? strlen(val) : SCSI_SN_LEN; + strncpy(newlun->scsisn, val, len+1); + break; + case(Opt_path): + len = (sizeof(newlun->path) > strlen(val)) ? strlen(val)+1 : sizeof(newlun->path); + strncpy(newlun->path, val, len); + break; + case(Opt_type): + i = 0; + while (iomode[i].tokenstr) { + if (strncmp(val, iomode[i].tokenstr, strlen(iomode[i].tokenstr) ==0)) { + newlun->type = i; + } + i++; + } + break; + case(Opt_iomode): + newlun->iomode = 0; + break; + case(Opt_err): + break; + } + } + start=end-argcopy+1; + } + } + + free(argcopy); + return(newlun); +} + +struct lun *lun_create(u32 tid, u32 lunno, char *args) +{ + struct lun *lun; + struct target *target = target_find_by_id(tid); + + if (!target) + return NULL; + if (!(lun = malloc(sizeof(*lun)))) + return NULL; + memset(lun, 0, sizeof(*lun)); + + INIT_LIST_HEAD(&lun->lunlist); + lun = parse_lun_args(args, lun); + lun->no = lunno; + insque(&lun->lunlist, &target->lun_list); + + return lun; +} + +void lun_destroy(u32 tid, u32 lun) +{ + struct lun *dellun = NULL; + struct target *target = target_find_by_id(tid); + + list_for_each_entry(dellun, &target->lun_list, lunlist) { + if (lun == dellun->no) + break; + } + if (!dellun) + return; + + remque(&dellun->lunlist); + free(dellun); +} + +void write_lun(struct lun *l, FILE *fp) +{ + fprintf(fp, "\tLun %d %s%s,", l->no, tokens[Opt_path].tokenstr, l->path); + fprintf(fp, "%s=%s,", tokens[Opt_type].tokenstr, iomode[l->type].tokenstr); + fprintf(fp, "%s%s,", tokens[Opt_scsiid].tokenstr, l->scsiid); + fprintf(fp, "%s%s\n", tokens[Opt_scsisn].tokenstr, l->scsisn); +} + +int write_lun_list(u32 tid, FILE *fp) +{ + struct lun *llun = NULL; + struct target *target = target_find_by_id(tid); + + if (!target) + return -1; + + list_for_each_entry(llun, &target->lun_list, lunlist) { + write_lun(llun, fp); + } + return 0; +} diff -Nur iscsitarget-0.4.16.orig/usr/lun.h iscsitarget-0.4.16/usr/lun.h --- iscsitarget-0.4.16.orig/usr/lun.h 1970-01-01 01:00:00.000000000 +0100 +++ iscsitarget-0.4.16/usr/lun.h 2008-06-17 13:04:16.000000000 +0200 @@ -0,0 +1,44 @@ +#ifndef LUN_H +#define LUN_H + +/* + * LUN configuration code + */ + +struct match_table_t { + int tokenno; + char *tokenstr; +}; + +enum { + Mode_fileio, Mode_blockio, Mode_nullio, Mode_unknownio, +}; + + +enum { + Opt_scsiid, Opt_scsisn, Opt_path, Opt_type, Opt_iomode, Opt_err, +}; + +struct lun { + u32 no; + struct qelem lunlist; + + char scsisn[SCSI_SN_LEN+1]; + char scsiid[SCSI_ID_LEN+1]; + char path[2048]; + u32 type; + u32 iomode; +}; + +extern struct match_table_t iomode[]; +extern struct match_table_t tokens[]; +extern struct qelem luns; + +extern struct lun *lun_alloc(u32 tid); +extern struct lun *lun_create(u32 tid, u32 lunno, char *args); +extern void lun_destroy(u32 tid, u32 lun); +extern void write_lun(struct lun *l, FILE *fp); +extern int write_lun_list(u32 tid, FILE *fp); + + +#endif diff -Nur iscsitarget-0.4.16.orig/usr/Makefile iscsitarget-0.4.16/usr/Makefile --- iscsitarget-0.4.16.orig/usr/Makefile 2008-03-18 07:41:02.000000000 +0100 +++ iscsitarget-0.4.16/usr/Makefile 2008-06-17 13:04:16.000000000 +0200 @@ -4,7 +4,7 @@ all: $(PROGRAMS) -ietd: ietd.o iscsid.o conn.o session.o target.o message.o ctldev.o log.o chap.o event.o param.o plain.o isns.o +ietd: ietd.o iscsid.o conn.o session.o target.o message.o ctldev.o log.o chap.o event.o param.o plain.o isns.o lun.o $(CC) $^ -o $@ $(LIBS) diff -Nur iscsitarget-0.4.16.orig/usr/plain.c iscsitarget-0.4.16/usr/plain.c --- iscsitarget-0.4.16.orig/usr/plain.c 2008-03-18 07:41:02.000000000 +0100 +++ iscsitarget-0.4.16/usr/plain.c 2008-06-19 08:29:04.000000000 +0200 @@ -12,6 +12,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <sys/stat.h> #include <sys/socket.h> @@ -21,11 +22,24 @@ #include <arpa/inet.h> #include "iscsid.h" +#include "ietadm.h" +#include "lun.h" #define BUFSIZE 4096 #define CONFIG_FILE "/etc/ietd.conf" +#define CONFIG_DIR "/etc/ietd.d" +#define CONFIGTID_DIR "/etc/ietd.d/tids/" +#define CONFIGTGT_DIR "/etc/ietd.d/targets/" +#define GLOBAL_FILE "/etc/ietd.d/globals.conf" + #define ACCT_CONFIG_FILE CONFIG_FILE + +static char *target_configfile(char *); +static char *tid_link(u32); +static int write_user_list(u32, FILE *); +static int write_target_file(u32); + /* * Account configuration code */ @@ -71,6 +85,7 @@ static struct qelem trgt_acct_in[1 << HASH_ORDER]; static struct qelem trgt_acct_out[1 << HASH_ORDER]; + static struct qelem *account_list_get(u32 tid, int dir) { struct qelem *list = NULL; @@ -113,7 +128,7 @@ pass = target_sep_string(&q); if (cops->account_add(tid, idx, name, pass) < 0) - fprintf(stderr, "%s %s\n", name, pass); + log_debug(1, "%s %s", name, pass); } } @@ -129,7 +144,7 @@ struct user *user = NULL; list_for_each_entry(user, list, ulist) { - fprintf(stderr, "%u %s %s\n", user->tid, user->password, user->name); + log_debug(1, "%u %s %s", user->tid, user->password, user->name); if (user->tid != tid) continue; if (!strlen(name)) @@ -176,6 +191,9 @@ account_destroy(user); /* update the file here. */ + log_debug(1, "plain_account_del"); + write_target_file(tid); + return 0; } @@ -227,6 +245,9 @@ insque(user, list); /* update the file here. */ + log_debug(1, "plain_account_add"); + write_target_file(tid); + return 0; out: account_destroy(user); @@ -428,8 +449,11 @@ if ((err = target_add(tid, name)) < 0) return err; - if (update) - ; /* Update the config file here. */ + if (update) { + log_debug(1, "__plain_target_create: update=true"); + write_target_file(*tid); + } else + log_debug(1, "__plain_target_create: update=false"); return err; } @@ -442,11 +466,32 @@ static int plain_target_destroy(u32 tid) { int err; - - if ((err = target_del(tid)) < 0) + struct target *target; + char *cfname = NULL; + char *tlink; + + list_for_each_entry(target, &targets_list, tlist) + if (target->tid == tid) + cfname = target_configfile(target->name); + + if ((err = target_del(tid)) < 0) { + if (cfname) + free(cfname); return err; + } /* Update the config file here. */ + if (cfname) { + if (unlink(cfname) == -1) + log_warning("unlink(): %s: %s", strerror(errno), cfname); + free(cfname); + /* remove link */ + tlink = tid_link(tid); + if (unlink(tlink) == -1) + log_warning("unlink(): %s: %s", strerror(errno), tlink); + free(tlink); + } + return err; } @@ -457,8 +502,16 @@ if ((err = ki->lunit_create(tid, lun, args)) < 0) return err; - if (update) - ; + if (update) { + log_debug(1, "__plain_lunit_create: update=true"); + lun_create(tid, lun, args); + write_lun_list(tid, stderr); + write_target_file(tid); + } else { + log_debug(1, "__plain_lunit_create: update=false"); + lun_create(tid, lun, args); + write_target_file(tid); + } return err; } @@ -470,7 +523,15 @@ static int plain_lunit_destroy(u32 tid, u32 lun) { - return ki->lunit_destroy(tid, lun); + int err; + + if ((err = ki->lunit_destroy(tid, lun)) < 0) + return err; + + lun_destroy(tid, lun); + write_target_file(tid); + + return err; } static int __plain_param_set(u32 tid, u64 sid, int type, @@ -482,7 +543,10 @@ return err; if (update) - ; + log_debug(1, "__plain_param_set: update=true"); + else + log_debug(1, "__plain_param_set: update=false"); + return err; } @@ -516,7 +580,11 @@ char *p, *q; int idx; u32 tid, val; + FILE *fp; + /* + FIXME: loop over all config files (starting with global.conf) + */ if (!(config = fopen(filename, "r"))) return -errno; @@ -555,6 +623,15 @@ } fclose(config); + + if (!(fp = fopen(GLOBAL_FILE, "w"))) { + log_error("fopen(): %s - %s", strerror(errno), GLOBAL_FILE); + return -EIO; + } + + write_user_list(0, fp); + fclose(fp); + return 0; } @@ -606,6 +683,137 @@ return 0; } +static int write_user_list(u32 tid, FILE *fp) +{ + struct user *user = NULL; + struct qelem *list = NULL; + + fprintf(fp, "\t# User settings\n"); + list = account_list_get(tid, AUTH_DIR_INCOMING); + list_for_each_entry(user, list, ulist) + fprintf(fp, "\t%s %s %s\n", user_keys[AUTH_DIR_INCOMING].name, user->name, user->password); + list = account_list_get(tid, AUTH_DIR_OUTGOING); + list_for_each_entry(user, list, ulist) + fprintf(fp, "\t%s %s %s\n", user_keys[AUTH_DIR_OUTGOING].name, user->name, user->password); + return 0; +} + + +static char *tid_link(u32 tid) +{ + char *tidlink; + int len = strlen(CONFIGTID_DIR)+strlen("4294967296")+2; + + tidlink = malloc(len); + snprintf(tidlink, len, "%s/%d", CONFIGTID_DIR, tid); + + return(tidlink); +} + +static char *target_configfile(char *targetname) +{ + char *targetcf; + int len = strlen(CONFIGTGT_DIR)+strlen(targetname)+2; + + targetcf = malloc(len); + snprintf(targetcf, len, "%s/%s", CONFIGTGT_DIR, targetname); + + return(targetcf); +} + +static int write_target_file(u32 tid) +{ + struct target *target; + struct iscsi_param target_param[target_key_last]; + struct iscsi_param session_param[session_key_last]; + char *targetcf, *tlink; + FILE *fp; + char buf[1024], *p; + int i; + + if (!tid) { + /* open target config file */ + if (!(fp = fopen(GLOBAL_FILE, "w"))) { + return -EIO; + } + + /* + if (*isns) + fprintf(fp, "iSNSServer %s\n", isns); + if (*isns_ac) + fprintf(fp, "iSNSAccessControl Yes\n"); + else + fprintf(fp, "iSNSAccessControl No\n"); + */ + write_user_list(tid, fp); + fclose(fp); + } else { + list_for_each_entry(target, &targets_list, tlist) { + if (target->tid == tid) { + /* construct file name */ + targetcf = target_configfile(target->name); + + /* open target config file */ + if (!(fp = fopen(targetcf, "w"))) { + log_error("fopen(): %s - %s", strerror(errno), targetcf); + free(targetcf); + return -EIO; + } + /* create link */ + tlink = tid_link(tid); + /* FIXME: relative link ? */ + if (symlink (targetcf, tlink) == -1) + log_warning("symlink(): %s - %s", strerror(errno), tlink); + free(tlink); + + /* target name */ + fprintf(fp, "Target %s\n", target->name); + + /* user list */ + write_user_list(tid, fp); + + /* target list */ + fprintf(fp, "\t# Target settings\n"); + memset(&target_param, 0, sizeof(target_param)); + ki->param_get(tid, 0, key_target, + target_param); + for (i = 0; i < target_key_last; i++) { + memset(buf, 0, sizeof(buf)); + strcpy(buf, target_keys[i].name); + p = buf + strlen(buf); + *p++ = ' '; + param_val_to_str(target_keys, i, target_param[i].val, p); + fprintf(fp, "\t%s\n", buf); + } + + /* target: lun list */ + fprintf(fp, "\t# LUN settings\n"); + write_lun_list(tid, fp); + + /* target: session */ + fprintf(fp, "\t# Session settings\n"); + memset(&session_param, 0, sizeof(session_param)); + ki->param_get(tid, 0, key_session, + session_param); + for (i = 0; i < session_key_last; i++) { + memset(buf, 0, sizeof(buf)); + strcpy(buf, session_keys[i].name); + p = buf + strlen(buf); + *p++ = ' '; + param_val_to_str(session_keys, i, session_param[i].val, p); + fprintf(fp, "\t%s\n", buf); + } + + fclose(fp); + free(targetcf); + return 0; + } + } + } + + return 0; +} + struct config_operations plain_ops = { .init = plain_init, .default_load = plain_default_load, diff -Nur iscsitarget-0.4.16.orig/usr/target.c iscsitarget-0.4.16/usr/target.c --- iscsitarget-0.4.16.orig/usr/target.c 2008-03-18 07:41:02.000000000 +0100 +++ iscsitarget-0.4.16/usr/target.c 2008-06-17 13:04:16.000000000 +0200 @@ -120,6 +120,7 @@ INIT_LIST_HEAD(&target->tlist); INIT_LIST_HEAD(&target->sessions_list); + INIT_LIST_HEAD(&target->lun_list); INIT_LIST_HEAD(&target->isns_head); target->tid = *tid; insque(&target->tlist, &targets_list); ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ Iscsitarget-devel mailing list Iscsitarget-devel@... https://lists.sourceforge.net/lists/listinfo/iscsitarget-devel |
|
|
Re: Online target database?
by Jeff Waller
::
Rate this Message:
|
|
|
Re: Online target database?
by Marcel Ritter
::
Rate this Message:
|
|
|
Re: Online target database?
by Jeff Waller
::
Rate this Message:
|
|
|
Re: Online target database?
by rswwalker
::
Rate this Message:
|
|
|
Re: Online target database?
by Jeff Waller
::
Rate this Message:
|
|
|
Re: Online target database?
by Chris Siebenmann
::
Rate this Message:
|
|
|
Re: Online target database?
by Chris Siebenmann
::
Rate this Message:
|
|
|
Re: Online target database?
by rswwalker
::
Rate this Message:
|
|
|
Re: Online target database?
by Jeff Waller
::
Rate this Message:
|
|
|
Re: Online target database? |
testiscsi.sh (1K)