rpms/autofs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix random selection patch.

Browse Source
This commit is contained in:
ikent 2007-03-16 07:31:43 +00:00
parent a2755999a3
commit ff519cfcac
1 changed files with 114 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
autofs-5.0.1-random-selection.patch
View File

@ -1,8 +1,114 @@
diff --git a/daemon/automount.c b/daemon/automount.c
index 5989324..938ee1b 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -48,6 +48,8 @@ const char *mapdir = AUTOFS_MAP_DIR; /* Location of mount maps */
--- autofs-5.0.1/include/replicated.h.random-selection 2007-03-16 16:27:36.000000000 +0900
+++ autofs-5.0.1/include/replicated.h 2007-03-16 16:27:54.000000000 +0900
@@ -60,6 +60,7 @@ struct host {
struct host *next;
};
+void seed_random(void);
void free_host_list(struct host **);
int parse_location(struct host **, const char *);
int prune_host_list(struct host **, unsigned int, const char *);
--- autofs-5.0.1/modules/replicated.c.random-selection 2007-03-16 16:27:36.000000000 +0900
+++ autofs-5.0.1/modules/replicated.c 2007-03-16 16:27:54.000000000 +0900
@@ -74,6 +74,29 @@
#define max(x, y) (x >= y ? x : y)
#define mmax(x, y, z) (max(x, y) == x ? max(x, z) : max(y, z))
+extern unsigned int random_selection;
+
+void seed_random(void)
+{
+ int fd;
+ unsigned int seed;
+
+ fd = open("/dev/random", O_RDONLY);
+ if (fd < 0) {
+ srandom(time(NULL));
+ return;
+ }
+
+ if (read(fd, &seed, sizeof(seed)) != -1)
+ srandom(seed);
+ else
+ srandom(time(NULL));
+
+ close(fd);
+
+ return;
+}
+
static unsigned int get_proximity(const char *host_addr, int addr_len)
{
struct sockaddr_in *msk_addr, *if_addr;
@@ -403,7 +426,11 @@ static unsigned int get_nfs_info(struct
status = rpc_ping_proto(rpc_info);
gettimeofday(&end, &tz);
if (status) {
- taken += elapsed(start, end);
+ if (random_selection)
+ /* Random value between 0 and 1 */
+ taken += ((float) random())/((float) RAND_MAX+1);
+ else
+ taken += elapsed(start, end);;
count++;
supported = NFS4_SUPPORTED;
}
@@ -440,7 +467,11 @@ v3_ver:
status = rpc_ping_proto(rpc_info);
gettimeofday(&end, &tz);
if (status) {
- taken += elapsed(start, end);
+ if (random_selection)
+ /* Random value between 0 and 1 */
+ taken += ((float) random())/((float) RAND_MAX+1);
+ else
+ taken += elapsed(start, end);;
count++;
supported |= NFS3_SUPPORTED;
}
@@ -470,7 +501,11 @@ v2_ver:
status = rpc_ping_proto(rpc_info);
gettimeofday(&end, &tz);
if (status) {
- taken += elapsed(start, end);
+ if (random_selection)
+ /* Random value between 0 and 1 */
+ taken += ((float) random())/((float) RAND_MAX+1);
+ else
+ taken += elapsed(start, end);;
count++;
supported |= NFS2_SUPPORTED;
}
@@ -610,8 +645,13 @@ static int get_supported_ver_and_cost(st
gettimeofday(&start, &tz);
status = rpc_ping_proto(&rpc_info);
gettimeofday(&end, &tz);
- if (status)
- taken = elapsed(start, end);
+ if (status) {
+ if (random_selection)
+ /* Random value between 0 and 1 */
+ taken = ((float) random())/((float) RAND_MAX+1);
+ else
+ taken = elapsed(start, end);
+ }
}
done:
if (rpc_info.proto->p_proto == IPPROTO_UDP) {
--- autofs-5.0.1/modules/mount_nfs.c.random-selection 2007-03-16 16:27:36.000000000 +0900
+++ autofs-5.0.1/modules/mount_nfs.c 2007-03-16 16:27:54.000000000 +0900
@@ -51,6 +51,8 @@ int mount_init(void **context)
} else
init_ctr++;
+ seed_random();
+
return !mount_bind;
}
--- autofs-5.0.1/daemon/automount.c.random-selection 2007-03-16 16:27:36.000000000 +0900
+++ autofs-5.0.1/daemon/automount.c 2007-03-16 16:27:54.000000000 +0900
@@ -48,6 +48,8 @@ const char *mapdir = AUTOFS_MAP_DIR; /*
const char *confdir = AUTOFS_CONF_DIR; /* Location of autofs config file */
static char *pid_file = NULL; /* File in which to keep pid */
@ -52,23 +158,9 @@ index 5989324..938ee1b 100644
case '?':
case ':':
printf("%s: Ambiguous or unknown options\n", program);
diff --git a/include/replicated.h b/include/replicated.h
index 970cd31..c77cda6 100644
--- a/include/replicated.h
+++ b/include/replicated.h
@@ -60,6 +60,7 @@ struct host {
struct host *next;
};
+void seed_random(void);
void free_host_list(struct host **);
int parse_location(struct host **, const char *);
int prune_host_list(struct host **, unsigned int, const char *);
diff --git a/man/automount.8 b/man/automount.8
index 9da82c4..59f2805 100644
--- a/man/automount.8
+++ b/man/automount.8
@@ -47,6 +47,10 @@ Define a global macro substitution variable. Global definitions
--- autofs-5.0.1/man/automount.8.in.random-selection 2007-03-16 16:27:36.000000000 +0900
+++ autofs-5.0.1/man/automount.8.in 2007-03-16 16:27:54.000000000 +0900
@@ -49,6 +49,10 @@ Define a global macro substitution varia
are over-ridden macro definitions of the same name specified in
mount entries.
.TP
@ -79,105 +171,3 @@ index 9da82c4..59f2805 100644
.I "\-V, \-\-version"
Display the version number, then exit.
.SH ARGUMENTS
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 4063e9a..25f72b9 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -51,6 +51,8 @@ int mount_init(void **context)
} else
init_ctr++;
+ seed_random();
+
return !mount_bind;
}
diff --git a/modules/replicated.c b/modules/replicated.c
index cb65d82..de1b40c 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -74,6 +74,29 @@
#define max(x, y) (x >= y ? x : y)
#define mmax(x, y, z) (max(x, y) == x ? max(x, z) : max(y, z))
+extern unsigned int random_selection;
+
+void seed_random(void)
+{
+ int fd;
+ unsigned int seed;
+
+ fd = open("/dev/random", O_RDONLY);
+ if (fd < 0) {
+ srandom(time(NULL));
+ return;
+ }
+
+ if (read(fd, &seed, sizeof(seed)) != -1)
+ srandom(seed);
+ else
+ srandom(time(NULL));
+
+ close(fd);
+
+ return;
+}
+
static unsigned int get_proximity(const char *host_addr, int addr_len)
{
struct sockaddr_in *msk_addr, *if_addr;
@@ -403,7 +426,11 @@ static unsigned int get_nfs_info(struct host *host,
status = rpc_ping_proto(rpc_info);
gettimeofday(&end, &tz);
if (status) {
- taken += elapsed(start, end);
+ if (random_selection)
+ /* Random value between 0 and 1 */
+ taken += ((float) random())/((float) RAND_MAX+1);
+ else
+ taken += elapsed(start, end);;
count++;
supported = NFS4_SUPPORTED;
}
@@ -440,7 +467,11 @@ v3_ver:
status = rpc_ping_proto(rpc_info);
gettimeofday(&end, &tz);
if (status) {
- taken += elapsed(start, end);
+ if (random_selection)
+ /* Random value between 0 and 1 */
+ taken += ((float) random())/((float) RAND_MAX+1);
+ else
+ taken += elapsed(start, end);;
count++;
supported |= NFS3_SUPPORTED;
}
@@ -470,7 +501,11 @@ v2_ver:
status = rpc_ping_proto(rpc_info);
gettimeofday(&end, &tz);
if (status) {
- taken += elapsed(start, end);
+ if (random_selection)
+ /* Random value between 0 and 1 */
+ taken += ((float) random())/((float) RAND_MAX+1);
+ else
+ taken += elapsed(start, end);;
count++;
supported |= NFS2_SUPPORTED;
}
@@ -610,8 +645,13 @@ static int get_supported_ver_and_cost(struct host *host, unsigned int version, c
gettimeofday(&start, &tz);
status = rpc_ping_proto(&rpc_info);
gettimeofday(&end, &tz);
- if (status)
- taken = elapsed(start, end);
+ if (status) {
+ if (random_selection)
+ /* Random value between 0 and 1 */
+ taken = ((float) random())/((float) RAND_MAX+1);
+ else
+ taken = elapsed(start, end);
+ }
}
done:
if (rpc_info.proto->p_proto == IPPROTO_UDP) {