Whamcloud - gitweb
Merge "b=21581 too long file / path names for old tar"
authorOleg Drokin <green@whamcloud.com>
Fri, 4 Mar 2011 23:51:32 +0000 (15:51 -0800)
committerGerrit Code Review <review@whamcloud.com>
Fri, 4 Mar 2011 23:51:32 +0000 (15:51 -0800)
lustre.spec.in
lustre/obdclass/genops.c
lustre/scripts/nodelustre [deleted file]
lustre/tests/auster
lustre/utils/mount_lustre.c

index 51a4f45..c81e335 100644 (file)
@@ -310,28 +310,6 @@ and Training offerings please visit
 http://www.sun.com/software/products/lustre/lustre_reg.jsp
 EOF
 
-# for update from < v1.4.6
-
-for f in /etc/modules.conf /etc/modprobe.conf /etc/modprobe.conf.local ; 
-do
-       if [ -f $f ]; then
-               if grep 'lustre llite' $f >/dev/null 2>/dev/null ; then
-                       [ ! -f $f.rpmsave ] && cp $f $f.rpmsave
-                       TMPFILE=`mktemp $f.XXXXXX` && \
-                       rm -f $TMPFILE && touch $TMPFILE && \
-                       grep -v 'lustre llite' $f >> $TMPFILE && \
-                       mv $TMPFILE $f
-               fi
-               if egrep "^[^#]*(add below|install) ptlrpc" $f ; then
-                       [ ! -f $f.rpmsave ] && cp $f $f.rpmsave
-                       TMPFILE=`mktemp $f.XXXXXX` && \
-                       rm -f $TMPFILE && touch $TMPFILE && \
-                       sed -e "s/^[^#]*\(add below\|install\) ptlrpc.*/#&/" $f >> $TMPFILE && \
-                       mv $TMPFILE $f
-               fi
-       fi
-done
-
 # If the kernel was built to reject unsupported modules (e.g. not a Lustre
 # kernel), and this hasn't been overridden in /etc/modprobe.d yet, then
 # print a warning so that users are aware of this issue.
index 51cd9b9..9a9adfa 100644 (file)
@@ -80,7 +80,6 @@ static struct obd_device *obd_device_alloc(void)
         }
         return obd;
 }
-EXPORT_SYMBOL(obd_device_alloc);
 
 static void obd_device_free(struct obd_device *obd)
 {
diff --git a/lustre/scripts/nodelustre b/lustre/scripts/nodelustre
deleted file mode 100755 (executable)
index 53e7965..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# nodelustre - Start and stop Lustre on MCR nodes
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
-# Gord Eagle <gord@clusterfs.com>, 2002-09-10
-
-# Set this to the shared config file.
-MASTER_CONFIG=http://emcri/lustre.xml
-CONFIG=/etc/lustre/lustre.xml
-COMPUTE_NODE=client
-
-LCONF=/usr/local/cfs/lustre/utils/lconf
-WGET=wget
-
-case "$1" in
-start | stop)
-  # Fetch the config file.  We can't use --output-document because it
-  # makes Wget ignore timestamping.
-  if test -n "$MASTER_CONFIG"; then
-    (cd `echo "$CONFIG" | sed 's%/[^/]*$%%'` && \
-      $WGET --timestamping "$MASTER_CONFIG") || exit $?
-  fi
-
-  # Map all client nodes to the COMPUTE_NODE virtual node.
-  if test -n "$COMPUTE_NODE" && nodeattr compute; then
-    node=" --node $COMPUTE_NODE"
-  else
-    node=
-  fi
-
-  # If we're stopping, do the lconf cleanup.
-  if test "$1" = stop; then
-    cleanup=' --cleanup'
-  else
-    cleanup=
-  fi
-
-  $LCONF$cleanup$node "$CONFIG"
-  ;;
-
-*)
-  echo "$0 {start|stop}" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
index ed55576..21087e0 100755 (executable)
@@ -18,6 +18,7 @@ Usage ${0##*/} [options]  suite [suite optoins] [suite [suite options]]
 Run Lustre regression tests suites.
       -c CONFIG Test environment config file
       -d LOGDIR Top level directory for logs
+      -D FULLLOGDIR Full directory for logs
       -f STR    Config name (cfg/<name>.sh)
       -i N      Repeat tests N times (default 1). A new directory
                 will be created under LOGDIR for each iteration.
@@ -61,14 +62,15 @@ verbose=false
 repeat_count=1
 upload_logs=false
 reformat=false
-test_logs_dir=/tmp/test_logs
+test_logs_dir=/tmp/test_logs/$(date +%Y-%m-%d)/$(date +%H%M%S)
 export SLOW=no
 export ${NAME:=local}
-while getopts "c:d:nkf:i:rRslhv" opt
+while getopts "c:d:D:nkf:i:rRslhv" opt
 do
     case "$opt" in
        c) CONFIG=$OPTARG;;
-       d) test_logs_dir=$OPTARG;;
+       d) test_logs_dir=$OPTARG/$(date +%Y-%m-%d)/$(date +%H%M%S);;
+       D) test_logs_dir=$OPTARG;;
        k) export FAIL_ON_ERROR=false;;
         n) dry_run=:;;
         v) verbose=:;;
@@ -224,7 +226,7 @@ run_suite_logged() {
 #
 # Add this to test-framework somewhere.
 reset_logging() {
-    export LOGDIR=${1:-${test_logs_dir}/$(date +%Y-%m-%d)/$(date +%H%M%S)}
+    export LOGDIR=$1
     unset YAML_LOG
     init_logging
 }
@@ -236,10 +238,9 @@ split_commas() {
 run_suites() {
     local n=0
     local argv=("$@")
-    local basedir=${test_logs_dir}/$(date +%Y-%m-%d)/$(date +%H%M%S)
     while ((n < repeat_count)); do
        local RC=0
-       local logdir=$basedir
+       local logdir=${test_logs_dir}
        ((repeat_count > 1)) && logdir="$logdir/$n"
        reset_logging $logdir
        set -- "${argv[@]}"
index db01c28..464dca9 100644 (file)
@@ -308,7 +308,7 @@ int parse_options(char *orig_options, int *flagp)
                                 retry = 0;
                 } else if (val && strncmp(arg, "mgssec", 6) == 0) {
                         append_option(options, opt);
-                } else if (strncmp(opt, "force", 5) == 0) {
+                } else if (strcmp(opt, "force") == 0) {
                         //XXX special check for 'force' option
                         ++force;
                         printf("force: %d\n", force);
@@ -720,9 +720,8 @@ int main(int argc, char *const argv[])
                         usource, target, strerror(errno));
                 if (errno == ENODEV)
                         fprintf(stderr, "Are the lustre modules loaded?\n"
-                                "Check /etc/modprobe.conf and /proc/filesystems"
-                                "\nNote 'alias lustre llite' should be removed"
-                                " from modprobe.conf\n");
+                                "Check /etc/modprobe.conf and "
+                                "/proc/filesystems\n");
                 if (errno == ENOTBLK)
                         fprintf(stderr, "Do you need -o loop?\n");
                 if (errno == ENOMEDIUM)