[Ocfstest-commits] mmatsuna commits r4 - trunk
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Nov 18 15:20:33 CST 2004
Author: mmatsuna
Date: 2004-11-18 15:20:31 -0600 (Thu, 18 Nov 2004)
New Revision: 4
Removed:
trunk/Cmdlist.sample
trunk/Makefile
trunk/Makefile.config
trunk/Nodelist.sample
trunk/Ocfsts/
trunk/README
trunk/TODO
trunk/client/
trunk/ocfsts.h
trunk/ocfsts.sh
trunk/ocfsts_diff.pl
trunk/server/
trunk/tests/
Log:
cleaned ancient files
Deleted: trunk/Cmdlist.sample
===================================================================
--- trunk/Cmdlist.sample 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/Cmdlist.sample 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,16 +0,0 @@
-
-R mkdir /tmp/foo 0666
-R chmod /tmp/foo 0766
-
-R create /tmp/foo/bar
-R chmod /tmp/foo/bar 0766
-
-R resize /tmp/foo/bar 2048
-R modify /tmp/foo/bar 1
-
-- R delete /tmp/foo/bar/baz
-
-R delete /tmp/foo/bar
-R rmdir /tmp/foo
-
-R quit
Deleted: trunk/Makefile
===================================================================
--- trunk/Makefile 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/Makefile 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,52 +0,0 @@
-#
-# ocfsts Makefile
-#
-
-include Makefile.config
-
-SERVERDIR=server
-CLIENTDIR=client
-
-.PHONY: clean tests perl
-
-all: all-redirect library perl
-
-library: $(OCFSTS_LIB_TARGET) $(OCFSTS_LIB_SERVER_TARGET)
- mv $(OCFSTS_LIB_SERVER_TARGET) $(PERL_DIR)/
-
-perl:
- make -f Build.wrapper -C $(PERL_DIR)
-
-tests:
- make -C $(TEST_DIR)
-
-tests-clean:
- make clean -C $(TEST_DIR)
-
-all-redirect: $(OCFSTS_LIB_TARGET) $(CLIENT_TARGET) $(SERVER_TARGET)
-
-#include Makefile.depend
-#depend:
-# $(CC) $(CXXFLAGS) -MM `find . -name '*.c'` > Makefile.depend
-
-$(OCFSTS_LIB_TARGET):
- make -e -C $(CLIENTDIR) $@
- mv $(CLIENTDIR)/$@ .
-
-$(SERVER_TARGET): $(OCFSTS_LIB_TARGET)
- make -e -C $(SERVERDIR) $@
- mv $(SERVERDIR)/$@ .
-
-$(CLIENT_TARGET): $(OCFSTS_LIB_TARGET)
- make -e -C $(CLIENTDIR) $@
- mv $(CLIENTDIR)/$@ .
-
-$(OCFSTS_LIB_SERVER_TARGET):
- make -e -C $(SERVERDIR) $@
- mv $(SERVERDIR)/$@ .
-
-clean:
- make -e -C $(SERVERDIR) clean
- make -e -C $(CLIENTDIR) clean
- rm -f $(OCFSTS_LIB_TARGET) $(CLIENT_TARGET) $(SERVER_TARGET) $(OCFSTS_LIB_SERVER_TARGET) *~
- make -e -C $(PERL_DIR) -f Build.wrapper clean
Deleted: trunk/Makefile.config
===================================================================
--- trunk/Makefile.config 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/Makefile.config 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,23 +0,0 @@
-#
-# Be carefull - this also gets sourced by a bash script.
-# Blame Greg for that one :)
-#
-TARGET=.
-NODEFILE=nodelist
-
-TEST_DIR="tests";
-RESULT_DIR="results";
-ORIGINAL_DIR="diffs";
-PERL_DIR=Ocfsts
-
-SERVER_TARGET=ocfsts_server
-CLIENT_TARGET=ocfsts_client
-OCFSTS_LIB_TARGET=libocfsts.a
-OCFSTS_LIB_SERVER_TARGET=libocfsts_server.so
-
-CLIENT_INSTALL_DIR=/tmp
-CLIENT_USER=root
-
-OCFSTS_PORT=4444
-
-DIFF=ocfsts_diff.pl
Deleted: trunk/Nodelist.sample
===================================================================
--- trunk/Nodelist.sample 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/Nodelist.sample 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,11 +0,0 @@
-# Sample node list for OCFS test suite
-verbose.us.oracle.com
-verbose.us.oracle.com
-verbose.us.oracle.com
-verbose.us.oracle.com
-#192.168.0.1
-#192.168.0.2
-#192.168.0.3
-#192.168.0.4
-#192.168.0.5
-#nic1-pc.us.oracle.com
Deleted: trunk/README
===================================================================
--- trunk/README 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/README 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,147 +0,0 @@
-
-OCFS Test Suite -- README
-
-Authors:
- mark.fasheh at oracle.com
- greg.marsden at oracle.com
-
-Table of Contents
- 0. Quick Start
- 1. Architecture description
- 2. System requirements
- 3. Configuration file formats
- 3.1. Node list
- 3.2. Command list
- 4. Known bugs
-
-0. Quick Start
-
-The ocfsts.sh script provides a wrapper for all important activies
-in ocfsts, including spawining client processes and cleaning them
-up after the tests have been run and diff files created against
-existing "correct" diff files.
-
-./ocfsts.sh make
- compile the test server and clients
-./ocfsts.sh makediffs
- generate the "original" diff files. These files are NOT
- automatically generated correctly, and must be hand tuned.
- This is a "bug" which could be fixed in the future.
- Also note that makediffs starts the clients on each node but does not
- shut them down.
-./ocfsts.sh run
- run the tests
-./ocfsts.sh kill
- kill all clients on the cluster
-
-Note that all configuration options, including placement of directories and
-diff files, is controlled in ocfsts.config
-
-
-1. Architecture description
-
-The OCFS Test Suite is a package for generic cluster-filesystem
-testing from multiple nodes. The package consists of two independent
-executables, one for each cluster node and one for the server (which
-can be run on a single node).
-
-The client waits for input on port 4444, executes the server command,
-and returns the response. The client shuts down only when a "QUIT"
-command is received. The server blocks until the client's response
-is received.
-
-This test suite was designed to exercise the filesystem in routine file
-operations and not under high load conditions. As such, the test server
-is single-threaded, providing only one file operation at a time and does
-not test behavior under multiple simultaneous queries.
-
-A compile-time flag allows the test suite to bypass verifications on
-the specified command node. This function is off by default, except
-in the cdsl case.
-
-
-2. System requirements
-
-OCFS is not required to run the test suite. Multiple instances of the
-local host (or any other host running the client binary) can be added
-to the nodes file.
-
-
-3. Configuration File formats
-
-Running the client:
- ./ocfs_test_client
- or
- while ! [ ] ; do ./ocfs_test_client ; done
-
-Running the server:
- ./ocfs_test_server nodefile < commands
- or
- ./ocfs_test_server nodefile commandlist
-
-3.1. Node file format
-
-The node file format is one node per line, any
-blank lines or extra characters after whitespace
-discarded. The comment character is '#'. Nodes
-can be specified by numeric ip (dotted quad) or
-by hostname.
-
-3.2. Command file format
-
-The command file format is one command per line,
-# or leading space is considered to be a comment
-and blank lines are ignored. The command syntax
-is as follows:
-
-[+-#] <node_name|node_number|R> <command> [filename] [arg1 . . . ] [cdsl[+-]]
-
-Optional success token: (defaults to "expect success")
- + expect the command to succeed
- - expect a fail
- # comment
-
-Node target: (required)
- R randomly choose a node
- node_name must be exactly as specified in the node file
- node_number 1-offset list of nodes specified; this can be
- verified on startup by consulting the node-table
- in the test suite log
-
-Command: (required)
-Absolute paths are recommended. Commands are specified with
-their arguments.
- quit
- link filename target_filename
- symlink filename target_filename
- mv filename target_filename
- chown filename newuid newgid
- mkdir filename mode
- chmod filename mode
- mknod filename mode major minor
- rmdir filename
- create filename
- delete filename
- fstat filename
- resize filename new_size
- modify filename entropy
- chksum filename
- cdsl filename
- open filename
- close filename
-
-CDSL status: (optional)
-Because CDSL testing involves an alternative method of
-verification, an optional argument can be appended of the form
- cdsl
-at the end of the command string, to "creat" a directory or file
-in the cdsl mode. See OCFS documentation for more detailed information.
-
-
-4. Known bugs
-
-Timestamps are calculated against Epoch and not against start time of
-the test program.
-
-Problems with generate_reports do not affect program performance, but does
-not provide correct output.
Deleted: trunk/TODO
===================================================================
--- trunk/TODO 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/TODO 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,34 +0,0 @@
-* Fix bug in server having to do with verification of mv commands (can't
- verify two times in a row)
-
-* Users should have one command to do everything, including any
- compilation (if needed) and running all the tests
-
-* One test command (make run-tests) to run all the tests. It should
- report on what tests passed and more importantly, which
- failed. Detailed logs should be kept somewhere
-
-* The tests run and create a .errors file per test where all errors are logged
-
-* Config should be minimal. At most one or two lines, preferably none.
-
-* Each file (excluding data files) needs to have an Oranotice at the top.
- This means:
- Oracle Copyright
- Author
- Filename
- Description
-
-* More tests need to be created. Go through the bug database and
- create tests to check that each bug hasn't regressed (what i mean is
- write a test to make sure the bugs fixed)
-
-* Fix some of the test commands. There's no reason why mkdir should
- have to specify a mode, modify does not need an entropy, etc.
-
-* Add some way to do process synchronization.
-
-* Update README file. It is waaaay out of sync with the rest of the project.
-
-* Have a cleanup script which we can run to basically cleanup $ROOT on all
- the nodes...
Deleted: trunk/ocfsts.h
===================================================================
--- trunk/ocfsts.h 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/ocfsts.h 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,8 +0,0 @@
-#ifndef _ocfsts_h_
-#define _ocfsts_h_
-
-#include "client/ocfstsparse.h"
-#include "client/command.h"
-#include "client/response.h"
-
-#endif //_ocfsts_h_
Deleted: trunk/ocfsts.sh
===================================================================
--- trunk/ocfsts.sh 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/ocfsts.sh 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,162 +0,0 @@
-#!/bin/bash
-#
-# OCFS testing script
-#
-
-source Makefile.config
-
-do_usage() {
- echo "usage: $0 make"
- echo " $0 makediffs"
- echo " $0 run"
- echo " $0 kill"
- echo ""
- echo "$0 is a simple command line interface to the "
- echo "ocfs test suite. Run 'make' to begin installation."
- echo ""
- echo "$0 commands:"
- echo "make - compile ocfsts"
- echo "makediffs - prepare default 'correct' output in $ORIGINAL_DIR"
- echo "run - perform tests and place diff output in $RESULT_DIR"
- echo "kill - close client processes on each node"
- echo ""
-}
-
-
-do_installer() {
- echo "Building binaries..."
-
- export SERVER_TARGET CLIENT_TARGET OCFSTS_LIB_TARGET
-
- make -e clean
-
- if ! make -e all-redirect
- then
- echo "Compile/make error."
- exit -1;
- fi
-
- echo "done."
-
- echo -e "Installing binaries..."
- echo "done."
-
- echo -e "Setting up directories..."
- mkdir -p $TARGET/$TEST_DIR
- mkdir -p $TARGET/$RESULT_DIR
- mkdir -p $TARGET/$ORIGINAL_DIR
- echo "done"
-
- echo " * * * "
- echo " Now set up diffs by running \"$0 makediffs\" and"
- echo " hand correcting the output in the $ORIGINAL_DIR directory."
- echo " * * * "
-}
-
-do_makediffs() {
- echo "WARNING!!!";
- echo " You are about to nuke potentially hand edited files."
- echo " You WILL have to re-edit these files by hand!"
- echo " "
- echo " Press CTRL-C now to abort."
- read
-
- spawn_clients
-
- for i in `ls -1 $TEST_DIR/test*`
- do
- VAR=$(echo $i | sed -e "s/$TEST_DIR/$ORIGINAL_DIR/" | sed -e "s/$/.orig/");
- echo ...creating $VAR
- touch $VAR
- $TARGET/$SERVER_TARGET $NODEFILE < $i > $VAR
- done
-}
-
-do_tests() {
-
- spawn_clients
-
- DATE=$(date)
-
- for i in `ls -1 $TEST_DIR/test*`
- do
- ORIGINAL=$(echo $i | sed -e "s/$TEST_DIR/$ORIGINAL_DIR/" | sed -e "s/$/.orig/");
- NEW=$(echo $i | sed -e "s/$TEST_DIR/$RESULT_DIR/" | sed -e "s/$/.$DATE/");
- LOG=$(echo $i | sed -e "s/$TEST_DIR/$RESULT_DIR/" | sed -e "s/$/.$DATE.out/");
-
- echo testing $i now...;
- #$TARGET/$SERVER_TARGET $NODEFILE < $i | tee "$NEW" | $DIFF "$ORIGINAL" | tee "$LOG"
- $TARGET/$SERVER_TARGET $NODEFILE < $i | tee "$NEW"
-
- $TARGET/$DIFF "$ORIGINAL" "$NEW" | tee "$LOG"
-
- echo done;
- done
-
- kill_clients
-}
-
-kill_clients() {
- for node in `cat $NODEFILE | awk '{print $1}'|grep -v ^#|sort|uniq`
- do
- ping -c1 $node >& /dev/null
- if [ $? -eq 0 ]
- then
- echo "Killing client on $node."
- ssh $CLIENT_USER@$node killall -9 $CLIENT_TARGET
- else
- echo "Host $node not alive!"
- fi
-
- done
-}
-
-spawn_clients() {
- for node in `cat $NODEFILE | awk '{print $1}'|grep -v ^#|sort|uniq`
- do
- ping -c1 $node >& /dev/null
- if [ $? -eq 0 ]
- then
- echo "Testing port $OCFSTS_PORT on $node"
- nc $node $OCFSTS_PORT -q0 < /dev/null >& /dev/null
- if [ $? -eq 0 ]
- then
- echo "Client already started"
- else
- echo "Starting client on $node"
- echo "Use authorized_keys on target machine to avoid entering password."
- scp $CLIENT_TARGET root@$node:$CLIENT_INSTALL_DIR/
- ssh $CLIENT_USER@$node $CLIENT_INSTALL_DIR/$CLIENT_TARGET
- fi
- else
- echo "Host $node not alive!"
- fi
-
- done
-}
-
-
-# Handle options
-
-case "$1" in
- make)
- do_installer
- ;;
- kill)
- kill_clients
- ;;
- spawn)
- spawn_clients
- ;;
- makediffs)
- do_makediffs
- ;;
- run)
- do_tests
- ;;
- *)
- do_usage
- exit 1
- ;;
-esac
-
Deleted: trunk/ocfsts_diff.pl
===================================================================
--- trunk/ocfsts_diff.pl 2003-08-19 22:47:44 UTC (rev 3)
+++ trunk/ocfsts_diff.pl 2004-11-18 21:20:31 UTC (rev 4)
@@ -1,20 +0,0 @@
-#!/usr/bin/perl -w
-
-unless (defined $ARGV[0] and defined $ARGV[1]) {
- usage();
- exit;
-}
-
-open (ORIGINAL, $ARGV[0]) or die "no original file";
-open (OUTPUT, $ARGV[1]) or die "no output data!";
-
-while ($orig_line=<ORIGINAL>) {
- $out_line = <OUTPUT>;
- if ($out_line =~ /Time/) {
- next;
- }
- if ($orig_line ne $out_line) {
- print "> $out_line";
- print "< $orig_line";
- }
-}
More information about the Ocfstest-commits
mailing list