summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2012-05-02 23:08:26 +0530
committerVijay Bellur <vijay@gluster.com>2012-05-02 23:08:26 +0530
commitdef4dac350869b037ea752cc3e1916f6c79974f7 (patch)
tree92a550acd1a9a7ca71c3ef4cc893ab12db979eb6
parenteb19564ffffd7c26dc2ec8c0216b6cc2f50194b1 (diff)
parent5552b7040e251aa2d90764b101806123d1b62b30 (diff)
Merge branch 'release-3.0' of ssh://git.gluster.com/glusterfs into release-3.0release-3.0
-rwxr-xr-xcommit.sh4
-rwxr-xr-xformat-patch.sh60
-rwxr-xr-xrfc.sh104
-rw-r--r--xlators/performance/quick-read/src/quick-read.c1
-rw-r--r--xlators/performance/write-behind/src/write-behind.c52
5 files changed, 134 insertions, 87 deletions
diff --git a/commit.sh b/commit.sh
deleted file mode 100755
index 9cc55c5..0000000
--- a/commit.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export EDITOR="emacs"
-git commit -a -e "$@"
diff --git a/format-patch.sh b/format-patch.sh
deleted file mode 100755
index 99afe47..0000000
--- a/format-patch.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-
-function is_num()
-{
- local num;
-
- num="$1";
-
- [ -z "$(echo $num | sed -e 's/[0-9]//g')" ]
-}
-
-
-function guess_branch()
-{
- local branch;
- local src_branch;
-
- branch=$(git branch | grep '*' | cut -f2 -d' ');
-
- if [ $branch = "master" ] ; then
- src_branch="master";
- else
- src_branch=$(cat .git/logs/refs/heads/$branch | head -n 1 \
- | sed -r -e 's/.*( [^ ]*)$/\1/g' | cut -f2 -d/);
- fi
-
- echo $src_branch
-}
-
-
-function main()
-{
- local branch;
- local bug;
-
- branch=$(guess_branch);
- echo
- echo "Patches are always to be associated with a bug ID. If there is no "
- echo "bug filed in bugzilla for this patch, it is highly suggested to file"
- echo "a new bug with a description and reasoning of this patchset. If this"
- echo "is a new feature, then file a new enhancement bug with a brief "
- echo "summary of the feature as the description."
- echo
- echo -n "Enter bug ID (from http://bugs.gluster.com/): "
- read bug;
-
- [ -z "$bug" ] || is_num $bug || {
- log "bug ID should be a valid bug number";
- exit;
- }
-
- if [ -z "$bug" ]; then
- git format-patch -s "$@";
- else
- git format-patch -s --subject-prefix="PATCH BRANCH:release-3.0 BUG:$bug" "$@";
- fi
-}
-
-main "$@"
diff --git a/rfc.sh b/rfc.sh
new file mode 100755
index 0000000..1939f96
--- /dev/null
+++ b/rfc.sh
@@ -0,0 +1,104 @@
+#!/bin/bash -e
+
+
+branch="release-3.0";
+
+
+function set_hooks_commit_msg()
+{
+ f=".git/hooks/commit-msg";
+ u="http://review.gluster.com/tools/hooks/commit-msg";
+
+ if [ -x "$f" ]; then
+ return;
+ fi
+
+ curl -o $f $u || wget -O $f $u;
+
+ chmod +x .git/hooks/commit-msg;
+}
+
+
+function is_num()
+{
+ local num;
+
+ num="$1";
+
+ [ -z "$(echo $num | sed -e 's/[0-9]//g')" ]
+}
+
+
+function rebase_changes()
+{
+ git fetch --all;
+
+ GIT_EDITOR=$0 git rebase -i origin/$branch;
+}
+
+
+function editor_mode()
+{
+ if [ $(basename "$1") = "git-rebase-todo" ]; then
+ sed -i 's/^pick /reword /g' "$1";
+ return;
+ fi
+
+ if [ $(basename "$1") = "COMMIT_EDITMSG" ]; then
+ if grep -qi '^BUG: ' $1; then
+ return;
+ fi
+ while true; do
+ echo Commit: "\"$(head -n 1 $1)\""
+ echo -n "Enter Bug ID: "
+ read bug
+ if [ -z "$bug" ]; then
+ return;
+ fi
+ if ! is_num "$bug"; then
+ echo "Invalid Bug ID ($bug)!!!";
+ continue;
+ fi
+
+ sed -i "s/^\(Change-Id: .*\)$/\1\nBUG: $bug/g" $1;
+ return;
+ done
+ fi
+
+ cat <<EOF
+$0 - editor_mode called on unrecognized file $1 with content:
+$(cat $1)
+EOF
+ return 1;
+}
+
+
+function assert_diverge()
+{
+ git diff origin/$branch..HEAD | grep -q .;
+}
+
+
+function main()
+{
+ if [ -e "$1" ]; then
+ editor_mode "$@";
+ return;
+ fi
+
+ set_hooks_commit_msg;
+
+ rebase_changes;
+
+ assert_diverge;
+
+ bug=$(git show --format='%b' | grep -i '^BUG: ' | awk '{print $2}');
+
+ if [ -z "$bug" ]; then
+ git push origin HEAD:refs/for/$branch/rfc;
+ else
+ git push origin HEAD:refs/for/$branch/bug-$bug;
+ fi
+}
+
+main "$@"
diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c
index 5cdceb4..8eaa061 100644
--- a/xlators/performance/quick-read/src/quick-read.c
+++ b/xlators/performance/quick-read/src/quick-read.c
@@ -137,6 +137,7 @@ qr_resume_pending_ops (qr_fd_ctx_t *qr_fd_ctx)
LOCK (&qr_fd_ctx->lock);
{
+ qr_fd_ctx->open_in_transit = 0;
list_splice_init (&qr_fd_ctx->waiting_ops,
&waiting_ops);
}
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index 79fe056..23ea2a0 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -318,6 +318,8 @@ wb_file_create (xlator_t *this, fd_t *fd, int32_t flags)
file->window_conf = conf->window_size;
file->flags = flags;
+ LOCK_INIT (&file->lock);
+
fd_ctx_set (fd, this, (uint64_t)(long)file);
out:
@@ -1322,21 +1324,23 @@ wb_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret,
goto out;
}
- /* If O_DIRECT then, we disable chaching */
- if (((flags & O_DIRECT) == O_DIRECT)
- || ((flags & O_ACCMODE) == O_RDONLY)
- || (((flags & O_SYNC) == O_SYNC)
- && conf->enable_O_SYNC == _gf_true)) {
- file->window_conf = 0;
- }
+ LOCK (&file->lock);
+ {
+ /* If O_DIRECT then, we disable chaching */
+ if (((flags & O_DIRECT) == O_DIRECT)
+ || ((flags & O_ACCMODE) == O_RDONLY)
+ || (((flags & O_SYNC) == O_SYNC)
+ && conf->enable_O_SYNC == _gf_true)) {
+ file->window_conf = 0;
+ }
- if (wbflags & GF_OPEN_NOWB) {
- file->disabled = 1;
+ if (wbflags & GF_OPEN_NOWB) {
+ file->disabled = 1;
+ }
}
-
- LOCK_INIT (&file->lock);
+ UNLOCK (&file->lock);
}
-
+
out:
STACK_UNWIND_STRICT (open, frame, op_ret, op_errno, fd);
return 0;
@@ -1396,22 +1400,24 @@ wb_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
goto out;
}
- /* If O_DIRECT then, we disable chaching */
- if (frame->local) {
- if (((flags & O_DIRECT) == O_DIRECT)
- || ((flags & O_ACCMODE) == O_RDONLY)
- || (((flags & O_SYNC) == O_SYNC)
- && (conf->enable_O_SYNC == _gf_true))) {
- file->window_conf = 0;
+ LOCK (&file->lock);
+ {
+ /* If O_DIRECT then, we disable chaching */
+ if (frame->local) {
+ if (((flags & O_DIRECT) == O_DIRECT)
+ || ((flags & O_ACCMODE) == O_RDONLY)
+ || (((flags & O_SYNC) == O_SYNC)
+ && (conf->enable_O_SYNC == _gf_true))) {
+ file->window_conf = 0;
+ }
}
}
-
- LOCK_INIT (&file->lock);
+ UNLOCK (&file->lock);
}
-
+
frame->local = NULL;
-out:
+out:
STACK_UNWIND_STRICT (create, frame, op_ret, op_errno, fd, inode, buf,
preparent, postparent);
return 0;