[DRBD-cvs] svn commit by phil - r2081 - in trunk: drbd user - *
Made the output of the user tools a bit prettier.
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Fri Feb 24 16:34:16 CET 2006
* R
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: phil
Date: 2006-02-24 16:34:15 +0100 (Fri, 24 Feb 2006)
New Revision: 2081
Modified:
trunk/drbd/drbd_receiver.c
trunk/user/drbdadm.h
trunk/user/drbdadm_main.c
trunk/user/drbdadm_usage_cnt.c
trunk/user/drbdmeta.c
Log:
* Made the output of the user tools a bit prettier.
* Removed some old cruft from drbd_receiver.c
Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c 2006-02-24 14:20:19 UTC (rev 2080)
+++ trunk/drbd/drbd_receiver.c 2006-02-24 15:34:15 UTC (rev 2081)
@@ -1372,14 +1372,6 @@
sector = be64_to_cpu(p->sector);
size = be32_to_cpu(p->blksize);
- /*
- * handled by NegDReply below ...
- ERR_IF (test_bit(DISKLESS,&mdev->flags)) {
- return FALSE;
- ERR_IF ( (mdev->gen_cnt[Flags] & MDF_Consistent) == 0 )
- return FALSE;
- */
-
if (size <= 0 || (size & 0x1ff) != 0 || size > DRBD_MAX_SEGMENT_SIZE) {
ERR("%s:%d: sector: %lu, size: %d\n", __FILE__, __LINE__,
(unsigned long)sector,size);
@@ -1717,10 +1709,8 @@
}
if (hg > 0) { // become sync source.
- D_ASSERT(drbd_md_test_flag(mdev->bc,MDF_Consistent));
rv = WFBitMapS;
} else if (hg < 0) { // become sync target
- drbd_md_clear_flag(mdev,MDF_Consistent);
drbd_uuid_set(mdev,Current,mdev->p_uuid[Bitmap]);
rv = WFBitMapT;
} else {
Modified: trunk/user/drbdadm.h
===================================================================
--- trunk/user/drbdadm.h 2006-02-24 14:20:19 UTC (rev 2080)
+++ trunk/user/drbdadm.h 2006-02-24 15:34:15 UTC (rev 2081)
@@ -85,7 +85,7 @@
extern int adm_connect(struct d_resource* ,const char* );
extern int adm_resize(struct d_resource* ,const char* );
extern int adm_syncer(struct d_resource* ,const char* );
-extern int admm_generic(struct d_resource* ,const char* );
+extern int _admm_generic(struct d_resource* ,const char*, int flags);
extern int m_system(char**,int );
extern struct d_option* find_opt(struct d_option*,char*);
extern void validate_resource(struct d_resource *);
Modified: trunk/user/drbdadm_main.c
===================================================================
--- trunk/user/drbdadm_main.c 2006-02-24 14:20:19 UTC (rev 2080)
+++ trunk/user/drbdadm_main.c 2006-02-24 15:34:15 UTC (rev 2081)
@@ -97,7 +97,7 @@
static int sh_ll_dev(struct d_resource* ,const char* );
static int sh_md_dev(struct d_resource* ,const char* );
static int sh_md_idx(struct d_resource* ,const char* );
- int admm_generic(struct d_resource* ,const char* );
+static int admm_generic(struct d_resource* ,const char* );
static int adm_khelper(struct d_resource* ,const char* );
static int adm_generic_b(struct d_resource* ,const char* );
static int hidden_cmds(struct d_resource* ,const char* );
@@ -631,7 +631,7 @@
return m_system(argv,SLEEPS_SHORT);
}
-int admm_generic(struct d_resource* res ,const char* cmd)
+int _admm_generic(struct d_resource* res ,const char* cmd, int flags)
{
char* argv[20];
int argc=0,i;
@@ -660,9 +660,14 @@
argv[argc++]=0;
- return m_system(argv,SLEEPS_VERY_LONG);
+ return m_system(argv,flags);
}
+static int admm_generic(struct d_resource* res ,const char* cmd)
+{
+ return _admm_generic(res, cmd, SLEEPS_VERY_LONG);
+}
+
static int adm_generic(struct d_resource* res,const char* cmd,int flags)
{
char* argv[20];
Modified: trunk/user/drbdadm_usage_cnt.c
===================================================================
--- trunk/user/drbdadm_usage_cnt.c 2006-02-24 14:20:19 UTC (rev 2080)
+++ trunk/user/drbdadm_usage_cnt.c 2006-02-24 15:34:15 UTC (rev 2081)
@@ -345,13 +345,14 @@
" how many users before you have installed this version (%s).\n"
" * With a high counter the DRBD developers have a high motivation to\n"
" continue development of the software.\n\n"
-"The following string will be send to the server:\n"
"http://"HTTP_HOST"/cgi-bin/insert_usage.pl?nu="U64"&nv="U32"\n\n"
"In case you want to participate but know that this machines is firewalled\n"
-"simply issue the query string with your favourite web browser or wget\n\n"
-"You can control all this by setting 'usage-count' in the globals section\n"
-"of your drbd.conf\n\n"
-"Just press [return], 'no' to opt out or give an optional node comment: ",
+"simply issue the query string with your favourite web browser or wget.\n"
+"You can control all this by setting 'usage-count' in your drbd.conf.\n\n"
+"* You may enter a free form comment about your machine, that gets\n"
+" used on "HTTP_HOST" instead of the big random number.\n"
+"* Enter 'no' to opt out.\n"
+"* To count this node without comment, just press [RETURN]\n",
update ? "an update" : "a new installation",
REL_VERSION,ni.node_uuid, ni.version_code);
fgets(answer,ANSWER_SIZE,stdin);
@@ -388,8 +389,7 @@
/* For our purpose (finding the revision) SLURP_SIZE is always enough.
*/
-char* run_adm_function( int (* function)(struct d_resource*,const char* ),
- struct d_resource* res ,const char* cmd)
+char* run_admm_generic(struct d_resource* res ,const char* cmd)
{
const int SLURP_SIZE = 4096;
int rr,pipes[2];
@@ -411,7 +411,9 @@
close(pipes[0]); // close reading end
dup2(pipes[1],1); // 1 = stdout
close(pipes[1]);
- exit(function(res,cmd));
+ exit(_admm_generic(res,cmd,
+ SLEEPS_VERY_LONG|SUPRESS_STDERR|
+ DONT_REPORT_FAILED));
}
close(pipes[1]); // close writing end
@@ -440,11 +442,11 @@
char *tb;
int rv,fd;
- tb = run_adm_function(admm_generic, res, "read-dev-uuid");
+ tb = run_admm_generic(res, "read-dev-uuid");
device_uuid = strto_u64(tb,NULL,16);
free(tb);
- rv = admm_generic(res, cmd); // cmd is "create-md".
+ rv = _admm_generic(res, cmd, SLEEPS_VERY_LONG); // cmd is "create-md".
if(!device_uuid) {
get_random_bytes(&device_uuid, sizeof(u64));
@@ -484,7 +486,7 @@
ssprintf( setup_opts[0], X64(016), device_uuid);
soi=1;
- admm_generic(res, "write-dev-uuid");
+ _admm_generic(res, "write-dev-uuid", SLEEPS_VERY_LONG);
return rv;
}
Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c 2006-02-24 14:20:19 UTC (rev 2080)
+++ trunk/user/drbdmeta.c 2006-02-24 15:34:15 UTC (rev 2081)
@@ -867,7 +867,7 @@
}
(void) cfg->ops->md_get_byte_offset(cfg);
- fprintf(stderr,"offset: "U64"\n", cfg->md_offset);
+ // fprintf(stderr,"offset: "U64"\n", cfg->md_offset);
cfg->md_mmaped_length = size;
cfg->on_disk.md =
@@ -1239,11 +1239,11 @@
cfg->al_offset = cfg->md_offset + cfg->md.al_offset * 512;
cfg->bm_offset = cfg->md_offset + cfg->md.bm_offset * 512;
- fprintf(stderr,"md_offset: "U64"\n", cfg->md_offset);
- fprintf(stderr,"al_offset: "U64" (%d)\n", cfg->al_offset, cfg->md.al_offset);
- fprintf(stderr,"bm_offset: "U64" (%d)\n", cfg->bm_offset, cfg->md.bm_offset);
- fprintf(stderr,"md_size_sect: %lu\n", (unsigned long)cfg->md.md_size_sect);
- fprintf(stderr,"bm_mmaped_length: %lu\n", (unsigned long)cfg->bm_mmaped_length);
+ //fprintf(stderr,"md_offset: "U64"\n", cfg->md_offset);
+ //fprintf(stderr,"al_offset: "U64" (%d)\n", cfg->al_offset, cfg->md.al_offset);
+ //fprintf(stderr,"bm_offset: "U64" (%d)\n", cfg->bm_offset, cfg->md.bm_offset);
+ //fprintf(stderr,"md_size_sect: %lu\n", (unsigned long)cfg->md.md_size_sect);
+ //fprintf(stderr,"bm_mmaped_length: %lu\n", (unsigned long)cfg->bm_mmaped_length);
cfg->al_mmaped_length = MD_AL_MAX_SECT_07 * 512;
cfg->on_disk.al =
@@ -1255,7 +1255,7 @@
MAP_SHARED, cfg->md_fd, cfg->bm_offset);
/* do you want to initilize al to something more usefull? */
- fprintf(stderr,"initialising activity log\n");
+ printf("initialising activity log\n");
MEMSET(cfg->on_disk.al, 0x00, MD_AL_MAX_SECT_07*512);
/* THINK
* do we really need to initialize the bitmap? */
@@ -1280,10 +1280,10 @@
}
}
#else
- fprintf(stderr,"initialising bitmap (%u KB)\n", (bm_bytes>>10));
+ printf("initialising bitmap (%u KB)\n", (bm_bytes>>10));
MEMSET((void*)cfg->on_disk.bm, 0xff, bm_bytes);
#endif
- fprintf(stderr,"\r100%%\n");
+ //fprintf(stderr,"\r100%%\n");
}
#endif
return 0;
@@ -2002,7 +2002,7 @@
MEMSET(&cfg->md, 0, sizeof(cfg->md));
err = cfg->ops->md_initialize(cfg);
err = err || cfg->ops->md_cpu_to_disk(cfg); // <- short circuit
- fprintf(stderr,"munmap... fsync...\n");
+ //fprintf(stderr,"munmap... fsync...\n");
err = cfg->ops->close(cfg) || err; // <- close always
if (err)
fprintf(stderr, "operation failed\n");
More information about the drbd-cvs
mailing list