add upgrade tests

Signed-off-by: Orit Wasserman <[email protected]>

Author: oritwas

.emacs

@@ -1,4 +1,5 @@
 ;; -*- mode: emacs-lisp -*-
+(package-initialize)
 
 (require 'xcscope)
 (require 'cc-mode)
@@ -7,7 +8,7 @@
 
 (require 'package) 
 (add-to-list 'package-archives
-             '("melpa" . "http://melpa.org/packages/") t)
+             '("melpa" . "http://melpa.org/packages/"))
 (when (< emacs-major-version 24)
   ;; For important compatibility libraries like cl-lib
   (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
@@ -16,10 +17,8 @@
 (add-to-list 'package-archives
              '("melpa-stable" . "http://stable.melpa.org/packages/") t)
 ;; set style
-
-(setq-default c-basic-offset 4 c-default-style "linux")
-(setq-default tab-width 4 indent-tabs-mode t)
-(define-key c-mode-base-map (kbd "RET") 'newline-and-indent)
+;;(setq-default c-basic-offset 2 c-default-style "linux")`(setq-default tab-width 8 indent-tabs-mode t)
+;;(define-key c-mode-base-map (kbd "RET") 'newline-and-indent)
 
 ;; auto repair brackets
 ;;(require 'autopair)
@@ -33,6 +32,7 @@
 
 ;;; auto complete mod
 ;;; should be loaded after yasnippet so that they can work together
+(add-to-list 'load-path "~/.emacs.d/elpa")
 (require 'auto-complete-config)
 (add-to-list 'ac-dictionary-directories "~/.emacs.d/ac-dict")
 (ac-config-default)
@@ -62,13 +62,6 @@
 ;display column number
 (column-number-mode 1)
 
-
-;;(defun my-c-mode-hook ()
-;;  (setq c-basic-offset 4
-;;        c-indent-level 4
-;;        c-default-style "cc-mode"))
-;;(add-hook 'c-mode-common-hook 'my-c-mode-hook)
-
 ; Allow completions like em-s-region to complete to emacspeak-speak-region
 ;;(partial-completion-mode)
 
@@ -198,17 +191,19 @@
   (global-set-key (kbd "C-c e") 'emacspeak-set-language-to-english)
   (global-set-key (kbd "C-c d") 'emacspeak-set-language-to-german))
 
-(define-prefix-command 'f8-map nil "f7=grep, f8=compile")
-(define-key f8-map [f8] 'compile)
-(define-key f8-map [f7] 'grep)
-(global-set-key [f8] 'f8-map)
-(custom-set-variables
+(global-set-key (kbd "C-c c") 'compile)
+(global-set-key (kbd "C-c g") 'grep)
+;(define-prefix-command 'f8-map nil "f7=grep, f8=compile")
+;(define-key f8-map [f8] 'compile)
+;(define-key f8-map [f7] 'grep)
+;(global-set-key [f8] 'f8-map)
+;(custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(column-number-mode t)
- '(load-home-init-file t t))
+ '(load-home-init-file t t)
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -286,3 +281,33 @@
 ;;       c-indent-level 4
 ;;       c-default-style "cc-mode"))
 ;;(add-hook 'c-mode-common-hook 'my-c-mode-hook)
+
+(c-add-style "my-style" 
+	     '("cc-mode"
+	       (indent-tabs-mode t)        ; use spaces rather than tabs
+	       (c-basic-offset . 2)         ; indent by 2 spaces
+	       (c-offsets-alist . ((inline-open . 0)  ; custom indentation rules
+                               (brace-list-open . 0)
+                               (statement-case-open . +)))))
+
+(defun my-c++-mode-hook ()
+  (c-set-style "my-style")        ; use my-style defined above
+  (auto-fill-mode)
+  (c-toggle-auto-hungry-state 1)
+  (c-toggle-auto-state 1)
+  (define-key c-mode-base-map (kbd "RET") 'newline-and-indent)
+)
+
+(add-hook 'c++-mode-hook 'my-c++-mode-hook)
+
+(setq-default show-trailing-whitespace t)
+
+(load-file "/home/owasserm/emacs-for-python/epy-init.el")
+(add-to-list 'load-path "/home/owasserm/emacs-for-python/") ;; tell where to load the various files
+(require 'epy-setup)      ;; It will setup other loads, it is required!
+(require 'epy-python)     ;; If you want the python facilities [optional]
+(require 'epy-completion) ;; If you want the autocompletion settings [optional]
+(require 'epy-editing)    ;; For configurations related to editing [optional]
+(require 'epy-nose)       ;; For nose integration
+
+(add-hook 'python-mode-hook (function cscope:hook))

clean_pool.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 BIN=$1
-$BIN/rados rmpool purge .rgw.root --yes-i-really-really-mean-it
+$BIN/rados purge .rgw.root --yes-i-really-really-mean-it
 $BIN/rados cppool .rgw.root.backup .rgw.root 

old_multi_zone_config.sh

@@ -1,13 +1,13 @@
 #!/bin/bash -x 
 
-SCRIPTS=/home/owasserm/scripts
+CONFIG=/home/owasserm/config
 ADMIN=/home/owasserm/hammer/src/radosgw-admin
-$ADMIN region set < $SCRIPTS/region0.json
+$ADMIN region set < $CONFIG/region0.json
 $ADMIN region default --rgw-region region0
 $ADMIN region get
 
-$ADMIN zone set --rgw-zone r0z0 < $SCRIPTS/r0z0.json
+$ADMIN zone set --rgw-zone r0z0 < $CONFIG/r0z0.json
 $ADMIN zone get --rgw-zone r0z0
-$ADMIN zone set --rgw-zone r0z1 < $SCRIPTS/r0z1.json
+$ADMIN zone set --rgw-zone r0z1 < $CONFIG/r0z1.json
 $ADMIN zone get --rgw-zone r0z1
 

run_gateway.sh

@@ -1,23 +1,30 @@
+#!/bin/bash -x
 
 PORT=8000
 CEPH_BIN="./bin"
+rgw_name="rgw"
 
 while [ $# -gt 0 ]; do
     case "$1" in
 	-p|--port)
 	    PORT="$2"
+	    rgw_name=$rgw_name$2
 	    ;;
 	-z|--zone)
 	    ZONE="--rgw-zone $2"
+	    rgw_name=$rgw_name$2
 	    ;;
 	-b|--bin)
 	    CEPH_BIN="$2"
 	    ;;
+	-c|--config)
+	    CEPH_CONFIG="$2"
+	    ;;
 	*)
             # unknown option
 	    ;;    
     esac
     shift # past argument
 done
 
-$CEPH_BIN/radosgw --log-file ./out/rgw.log --rgw-frontends="civetweb port=$PORT" --debug-rgw=20 --debug-ms=5 $ZONE
+$CEPH_BIN/radosgw --log-file ./out/$rgw_name.log --rgw-frontends="civetweb port=$PORT" $CEPH_CONFIG --debug-rgw=20 --debug-ms=5 $ZONE

run_s3_tests.sh

@@ -1,3 +1,4 @@
+conf=${1:-"skinny.conf"}
 cd $HOME/ceph/s3-tests/
 
-S3TEST_CONF=$HOME/ceph/s3-tests/skinny.conf $HOME/ceph/s3-tests/virtualenv/bin/nosetests --debug=DEBUG s3tests -v -a '!fails_on_rgw' 
+S3TEST_CONF=$HOME/ceph/s3-tests/$conf $HOME/ceph/s3-tests/virtualenv/bin/nosetests --debug=DEBUG s3tests -v -a '!fails_on_rgw' 

upgrate_test_hammer.sh

@@ -1,6 +1,7 @@
 OLD=/home/owasserm/hammer/src
 NEW=/home/owasserm/jewel/src
 OUT_DIR=/home/owasserm/upgrade
+CONFIG_SCRIPT=$1
 
 export CEPH_OUT_DIR=$OUT_DIR/out
 export CEPH_DEV_DIR=$OUT_DIR/dev
@@ -9,9 +10,8 @@ export CEPH_DEV_DIR=$OUT_DIR/dev
 echo "Running hammer"
 cd $OLD
 ./vstart.sh -n
-# config
-echo "config with" $1
-$1
+echo "config with" $CONFIG_SCRIPT
+$CONFIG_SCRIPT
 echo "Backing up .rgw.root pool"
 ./rados mkpool .rgw.root.backup
 ./rados cppool .rgw.root .rgw.root.backup

upgrate_test_jewel.sh

@@ -26,3 +26,5 @@ echo "Running jewel"
 cd $NEW
 ./vstart.sh
 /home/owasserm/scripts/run_gateway.sh -b $NEW/ $ZONE
+
+/home/owasserm/scripts/run_gateway.sh -b $NEW/ -p 8001 $ZONE 

us_region_config.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -x 
+
+CONFIG=/home/owasserm/scripts
+ADMIN=/home/owasserm/hammer/src/radosgw-admin
+$ADMIN region set < $CONFIG/us.json
+$ADMIN region default --rgw-region us
+$ADMIN region get
+
+$ADMIN zone set --rgw-zone us-west < $CONFIG/us-west.json
+$ADMIN zone get --rgw-zone us-west
+$ADMIN zone set --rgw-zone us-east < $CONFIG/us-east.json
+$ADMIN zone get --rgw-zone us-east
+