Fix an urgent issue in OS X build for 10.12 sierra.

Fix dockerfile.
Fix user-agent prefix to have docker instead of suffix.
2026-07-31 15:55:18 +03:00 · 2016-10-24 13:34:01 -07:00 · 2016-10-21 18:46:33 -07:00 · 2016-10-21 17:49:56 -07:00 · 2016-10-20 13:39:24 -07:00 · 2016-10-18 17:22:20 -07:00
306 changed files with 8404 additions and 42395 deletions
@@ -1,33 +1,13 @@
-<!--- Provide a general summary of the issue in the Title above -->
+## Expected behaviour

-## Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
+## Actual behaviour

-## Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+## Steps to reproduce the behaviour

-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
+## Minio version
+- (paste output of `minio version`)
+
+## System information

-## Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.

-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->

-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
-* Environment name and version (e.g. nginx 1.9.1):
-* Server type and version:
-* Operating System and version:
-* Link to your project:
@@ -1,28 +0,0 @@
-<!--- Provide a general summary of your changes in the Title above -->
-
-## Description
-<!--- Describe your changes in detail -->
-
-## Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
-
-## Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
@@ -7,6 +7,9 @@ language: go

 os:
 - linux
+- osx
+
+osx_image: xcode7.2

 env:
 - ARCH=x86_64
@@ -20,4 +23,4 @@ after_success:
 - bash <(curl -s https://codecov.io/bash)

 go:
- 1.7.3
+- 1.7.1
@@ -1,6 +1,6 @@
 ### Install Golang

-If you do not have a working Golang environment setup please follow [Golang Installation Guide](https://docs.minio.io/docs/how-to-install-golang).
+If you do not have a working Golang environment setup please follow [Golang Installation Guide](./INSTALLGO.md).

 ### Setup your Minio Github Repository
 Fork [Minio upstream](https://github.com/minio/minio/fork) source repository to your own personal repository. Copy the URL for minio from your personal github repo (you will need it for the `git clone` command below).
@@ -3,16 +3,15 @@ FROM golang:1.7-alpine
 WORKDIR /go/src/app

 COPY . /go/src/app
-
 RUN \
 	apk add --no-cache git && \
 	go-wrapper download && \
-	go-wrapper install -ldflags "-X github.com/minio/minio/cmd.Version=2016-11-24T02:09:08Z -X github.com/minio/minio/cmd.ReleaseTag=RELEASE.2016-11-24T02-09-08Z -X github.com/minio/minio/cmd.CommitID=0e87f29de9a022d3618e2e84e54c34e2338b4b6a" && \
+	go-wrapper install -ldflags "-X github.com/minio/minio/cmd.Version=2016-10-22T00:50:41Z -X github.com/minio/minio/cmd.ReleaseTag=RELEASE.2016-10-22T00-50-41Z -X github.com/minio/minio/cmd.CommitID=d1331ecc5cc4abc7304157cc26be64618821a77c" && \
 	mkdir -p /export/docker && \
-	cp /go/src/app/docs/docker/README.md /export/docker/ && \
+	cp /go/src/app/docs/Docker.md /export/docker/ && \
 	rm -rf /go/pkg /go/src && \
 	apk del git

 EXPOSE 9000
-ENTRYPOINT ["minio"]
+ENTRYPOINT ["go-wrapper", "run"]
 VOLUME ["/export"]
@@ -18,7 +18,7 @@ $

  - Run `go get foo/bar`
  - Edit your code to import foo/bar
-  - Run `govendor add foo/bar` from top-level directory
+  - Run `govendor add foo/bar` from top-level folder

 #### Remove dependencies 

@@ -92,8 +92,8 @@ ineffassign:

 cyclo:
 	@echo "Running $@:"
-	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/gocyclo -over 100 cmd
-	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/gocyclo -over 100 pkg
+	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/gocyclo -over 65 cmd
+	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/gocyclo -over 65 pkg

 build: getdeps verifiers $(UI_ASSETS)

@@ -101,9 +101,8 @@ deadcode:
 	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/deadcode

 spelling:
-	@-GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell -error `find cmd/`
-	@-GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell -error `find pkg/`
-	@-GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell -error `find docs/`
+	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell -error cmd/**/*
+	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell -error pkg/**/*

 test: build
 	@echo "Running all minio testing:"
@@ -2,98 +2,107 @@

 Minio is an object storage server released under Apache License v2.0. It is compatible with Amazon S3 cloud storage service. It is best suited for storing unstructured data such as photos, videos, log files, backups and container / VM images. Size of an object can range from a few KBs to a maximum of 5TB.

+##  1. Download
 Minio server is light enough to be bundled with the application stack, similar to NodeJS, Redis and MySQL.

-## Docker Container
-### Stable
-```sh
-$ docker pull minio/minio
-$ docker run -p 9000:9000 minio/minio server /export
-```
-
-### Edge
-```sh
-$ docker pull minio/minio:edge
-$ docker run -p 9000:9000 minio/minio:edge server /export
-```
-Please visit Minio Docker quickstart guide for more [here](https://docs.minio.io/docs/minio-docker-quickstart-guide)
-
-## OS X
-### Homebrew
-Install minio packages using [Homebrew](http://brew.sh/)
-
-```sh
-$ brew install minio
-$ minio server ~/Photos
-```
-
-### Binary Download
-| Platform| Architecture | URL|
-| ----------| -------- | ------|
-|Apple OS X|64-bit Intel|https://dl.minio.io/server/minio/release/darwin-amd64/minio|
-```sh
-$ chmod 755 minio
-$ ./minio server ~/Photos
-```
-
-## GNU/Linux
-### Binary Download
 | Platform| Architecture | URL|
 | ----------| -------- | ------|
 |GNU/Linux|64-bit Intel|https://dl.minio.io/server/minio/release/linux-amd64/minio|
 ||32-bit Intel|https://dl.minio.io/server/minio/release/linux-386/minio|
 ||32-bit ARM|https://dl.minio.io/server/minio/release/linux-arm/minio|
-```sh
-$ chmod +x minio
-$ ./minio server ~/Photos
-```
-
-## Microsoft Windows
-### Binary Download
-| Platform| Architecture | URL|
-| ----------| -------- | ------|
+|Apple OS X|64-bit Intel|https://dl.minio.io/server/minio/release/darwin-amd64/minio|
 |Microsoft Windows|64-bit|https://dl.minio.io/server/minio/release/windows-amd64/minio.exe|
 ||32-bit|https://dl.minio.io/server/minio/release/windows-386/minio.exe|
+|FreeBSD|64-bit|https://dl.minio.io/server/minio/release/freebsd-amd64/minio|
+
+### Install from Homebrew
+Install minio packages using [Homebrew](http://brew.sh/)
+ 
 ```sh
-C:\Users\Username\Downloads> minio.exe server D:\Photos
+$ brew install minio
+$ minio --help
 ```

-## FreeBSD
-### Binary Download
-| Platform| Architecture | URL|
-| ----------| -------- | ------|
-|FreeBSD|64-bit|https://dl.minio.io/server/minio/release/freebsd-amd64/minio|
+### Install from Source
+Source installation is only intended for developers and advanced users. If you do not have a working Golang environment, please follow [How to install Golang](https://docs.minio.io/docs/how-to-install-golang).
+
+
+```sh
+$ go get -u github.com/minio/minio
+```
+
+## 2. Run Minio Server
+In the examples below, Minio serves the contents of the ``Photos`` directory as an object store.
+
+### Docker Container
+
+```sh
+$ docker pull minio/minio
+$ docker run -p 9000:9000 minio/minio server /export
+```
+
+Please visit Minio Docker quickstart guide for more [here](https://docs.minio.io/docs/minio-docker-quickstart-guide)
+
+### GNU/Linux
+
+```sh
+$ chmod +x minio
+$ ./minio --help
+$ ./minio server ~/Photos
+...
+```
+
+### OS X
+
 ```sh
 $ chmod 755 minio
+$ ./minio --help
 $ ./minio server ~/Photos
+...
+```
+
+### Microsoft Windows
+
+```sh
+C:\Users\Username\Downloads> minio.exe --help
+C:\Users\Username\Downloads> minio.exe server D:\Photos
+...
+```
+
+### FreeBSD
+
+```sh
+$ chmod 755 minio
+$ ./minio --help
+$ ./minio server ~/Photos
+...
 ```
 Please visit official zfs FreeBSD guide for more details [here](https://www.freebsd.org/doc/handbook/zfs-quickstart.html)

-## Install from Source
-
-Source installation is only intended for developers and advanced users. If you do not have a working Golang environment, please follow [How to install Golang](https://docs.minio.io/docs/how-to-install-golang).
-
-```sh
-
-$ go get -u github.com/minio/minio
-
-```
-
-## Test using Minio Browser
-Minio Server comes with an embedded web based object browser. Point your web browser to http://127.0.0.1:9000 ensure your server has started successfully.
+## 3. Test Minio Server using Minio Browser
+Open a web browser and navigate to http://127.0.0.1:9000 to view your buckets on minio server.

 ![Screenshot](https://github.com/minio/minio/blob/master/docs/screenshots/minio-browser.jpg?raw=true)

-## Test using Minio Client `mc`
-`mc` provides a modern alternative to UNIX commands like ls, cat, cp, mirror, diff etc. It supports filesystems and Amazon S3 compatible cloud storage services. Follow the Minio Client [Quickstart Guide](https://docs.minio.io/docs/minio-client-quickstart-guide) for further instructions.
+## 4. Test Minio Server using `mc`
+Install mc from [here](https://docs.minio.io/docs/minio-client-quickstart-guide). Use `mc ls` command to list all the buckets on your minio server.

-## Explore Further
+```sh
+$ mc config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
+$ mc mb myminio/mybucket
+$ mc ls myminio/
+[2015-08-05 08:13:11 IST]     0B mybucket/
+```
+
+For more examples please navigate to [Minio Client Complete Guide](https://docs.minio.io/docs/minio-client-complete-guide).
+
+## 5. Explore Further
 - [Minio Erasure Code QuickStart Guide](https://docs.minio.io/docs/minio-erasure-code-quickstart-guide)
+- [Minio Docker Quickstart Guide](https://docs.minio.io/docs/minio-docker-quickstart-guide)
 - [Use `mc` with Minio Server](https://docs.minio.io/docs/minio-client-quickstart-guide)
 - [Use `aws-cli` with Minio Server](https://docs.minio.io/docs/aws-cli-with-minio)
 - [Use `s3cmd` with Minio Server](https://docs.minio.io/docs/s3cmd-with-minio)
 - [Use `minio-go` SDK with Minio Server](https://docs.minio.io/docs/golang-client-quickstart-guide)
- [The Minio documentation website](https://docs.minio.io)

-## Contribute to Minio Project
+## 6. Contribute to Minio Project
 Please follow Minio [Contributor's Guide](https://github.com/minio/minio/blob/master/CONTRIBUTING.md)
@@ -1,200 +0,0 @@
-# Minio 快速入门 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/minio/minio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Go Report Card](https://goreportcard.com/badge/minio/minio)](https://goreportcard.com/report/minio/minio) [![codecov](https://codecov.io/gh/minio/minio/branch/master/graph/badge.svg)](https://codecov.io/gh/minio/minio)
-
-Minio是一个对象存储服务，基于Apache License v2.0协议. 它完全兼容亚马逊的S3云储存服务，非常适合于存储很多非结构化的数据，例如图片、视频、日志文件、备份数据和容器/虚拟机镜像等，而一个对象文件可以是任意大小，从几kb到最大5T不等。 
-
-##  1. 下载
-
-Minio是一个非常轻量的服务,可以很简单的和其他应用的结合，类似 NodeJS, Redis 或者 MySQL.
-
-| Platform| Architecture | URL|
-| ----------| -------- | ------|
-|GNU/Linux|64-bit Intel|https://dl.minio.io/server/minio/release/linux-amd64/minio|
-||32-bit Intel|https://dl.minio.io/server/minio/release/linux-386/minio|
-||32-bit ARM|https://dl.minio.io/server/minio/release/linux-arm/minio|
-|Apple OS X|64-bit Intel|https://dl.minio.io/server/minio/release/darwin-amd64/minio|
-|Microsoft Windows|64-bit|https://dl.minio.io/server/minio/release/windows-amd64/minio.exe|
-||32-bit|https://dl.minio.io/server/minio/release/windows-386/minio.exe|
-|FreeBSD|64-bit|https://dl.minio.io/server/minio/release/freebsd-amd64/minio|
-
-### Homebrew 安装
-
-使用[Homebrew](http://brew.sh/) 来安装minio
- 
-```sh
-$ brew install minio
-$ minio --help
-```
-
-### 源码安装
-
-源码安装只针对开发者和一些高级用户，如果你还没有golang的环境，请安装golang官网安装[How to install Golang](https://docs.minio.io/docs/zh-CN/how-to-install-golang).
-
-```sh
-
-$ go get -u github.com/minio/minio
-
-
-```
-
-## 2. 运行Minio服务
-
-
-### GNU/Linux
-
- ```sh
-
-$ chmod +x minio
-$ ./minio --help
-$ ./minio server ~/Photos
-
-端点:  http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
-AccessKey: USWUXHGYZQYFYFFIT3RE
-SecretKey: MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
-区域:    us-east-1
-
-浏览器访问入口:
-   http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
-
-命令行访问: https://docs.minio.io/docs/zh-CN/minio-client-quickstart-guide
-   $ mc config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
-
-对象操作API (兼容Amazon S3):
-   Go:         https://docs.minio.io/docs/zh-CN/golang-client-quickstart-guide
-   Java:       https://docs.minio.io/docs/zh-CN/java-client-quickstart-guide
-   Python:     https://docs.minio.io/docs/zh-CN/python-client-quickstart-guide
-   JavaScript: https://docs.minio.io/docs/zh-CN/javascript-client-quickstart-guide
-
-```
-
-### OS X
-
-
- ```sh
-
-$ chmod 755 minio
-$ ./minio --help
-$ ./minio server ~/Photos
-
-端点:  http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
-AccessKey: USWUXHGYZQYFYFFIT3RE
-SecretKey: MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
-区域:    us-east-1
-
-浏览器访问入口:
-   http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
-
-命令行访问: https://docs.minio.io/docs/zh-CN/minio-client-quickstart-guide
-   $ mc config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
-
-对象操作API (兼容Amazon S3):
-   Go:         https://docs.minio.io/docs/zh-CN/golang-client-quickstart-guide
-   Java:       https://docs.minio.io/docs/zh-CN/java-client-quickstart-guide
-   Python:     https://docs.minio.io/docs/zh-CN/python-client-quickstart-guide
-   JavaScript: https://docs.minio.io/docs/zh-CN/javascript-client-quickstart-guide
-
-```
-
-### Microsoft Windows
-
-```sh
-
-C:\Users\Username\Downloads> minio.exe --help
-C:\Users\Username\Downloads> minio.exe server D:\Photos
-
-端点:  http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
-AccessKey: USWUXHGYZQYFYFFIT3RE
-SecretKey: MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
-区域:    us-east-1
-
-浏览器访问入口:
-   http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
-
-命令行访问: https://docs.minio.io/docs/zh-CN/minio-client-quickstart-guide
-   $ mc.exe config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
-
-对象操作API (兼容Amazon S3):
-   Go:         https://docs.minio.io/docs/zh-CN/golang-client-quickstart-guide
-   Java:       https://docs.minio.io/docs/zh-CN/java-client-quickstart-guide
-   Python:     https://docs.minio.io/docs/zh-CN/python-client-quickstart-guide
-   JavaScript: https://docs.minio.io/docs/zh-CN/javascript-client-quickstart-guide
-
-
-```
-
-### Docker
-
-```sh
-
-$ docker pull minio/minio
-$ docker run -p 9000:9000 minio/minio
-
-```
-访问minio的docker入门指南获得更多内容 [here](https://docs.minio.io/docs/zh-CN/minio-docker-quickstart-guide)
-
-### FreeBSD
-
-```sh
-
-$ chmod 755 minio
-$ ./minio --help
-$ ./minio server ~/Photos
-
-端点:  http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
-AccessKey: USWUXHGYZQYFYFFIT3RE
-SecretKey: MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
-区域:    us-east-1
-
-浏览器访问入口:
-   http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
-
-命令行访问: https://docs.minio.io/docs/zh-CN/minio-client-quickstart-guide
-   $ mc config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
-
-对象操作API (兼容Amazon S3):
-   Go:         https://docs.minio.io/docs/zh-CN/golang-client-quickstart-guide
-   Java:       https://docs.minio.io/docs/zh-CN/java-client-quickstart-guide
-   Python:     https://docs.minio.io/docs/zh-CN/python-client-quickstart-guide
-   JavaScript: https://docs.minio.io/docs/zh-CN/javascript-client-quickstart-guide
-
-
-```
-请访问FreeBSD的官网指南获取更多详细信息[here](https://www.freebsd.org/doc/handbook/zfs-quickstart.html)
-
-## 3. 使用浏览器测试minio服务
-
-打开浏览器并输入 http://127.0.0.1:9000 查看在minio服务器上面的所有bucket
-
-![Screenshot](https://github.com/minio/minio/blob/master/docs/screenshots/minio-browser.jpg?raw=true)
-
-
-## 4. 使用`mc`测试minio服务
-
-
-按照 [这个](https://docs.minio.io/docs/minio-client-quickstart-guide) 安装mc. 使用 `mc ls` 命令显示所有在minio服务上面的bucket.
-
-```sh
-
-$ mc ls myminio/
-[2015-08-05 08:13:22 IST]     0B andoria/
-[2015-08-05 06:14:26 IST]     0B deflector/
-[2015-08-05 08:13:11 IST]     0B ferenginar/
-[2016-03-08 14:56:35 IST]     0B jarjarbing/
-[2016-01-20 16:07:41 IST]     0B my.minio.io/
-
-```
-
-查看更多的例子请访问 [Minio Client Complete Guide](https://docs.minio.io/docs/zh-CN/minio-client-complete-guide).
-
-
-## 5. 更多内容
-
- [Minio Erasure Code 快速入门](https://docs.minio.io/docs/zh-CN/minio-erasure-code-quickstart-guide)
- [Minio Docker 快速入门](https://docs.minio.io/docs/zh-CN/minio-docker-quickstart-guide)
- [使用`mc`测试 Minio Server](https://docs.minio.io/docs/zh-CN/minio-client-quickstart-guide)
- [使用 `aws-cli` 测试 Minio Server](https://docs.minio.io/docs/zh-CN/aws-cli-with-minio)
- [使用 `s3cmd` 测试 Minio Server](https://docs.minio.io/docs/zh-CN/s3cmd-with-minio)
- [使用 `minio-go` SDK ce's测试 Minio Server](https://docs.minio.io/docs/zh-CN/golang-client-quickstart-guide)
-
-
-## 6. 给Minio项目贡献
-请按照Minio [贡献者指导手册](https://github.com/minio/minio/blob/master/CONTRIBUTING.md)
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Minio Cloud Storage, (C) 2014-2016 Minio, Inc.
+# Minio Cloud Storage, (C) 2015 Minio, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,21 +21,14 @@ _init() {

    ## Minimum required versions for build dependencies
    GIT_VERSION="1.0"
-    GO_VERSION="1.7.1"
+    GO_VERSION="1.6"
    OSX_VERSION="10.8"
-    KNAME=$(uname -s)
-    ARCH=$(uname -m)
+    UNAME=$(uname -sm)
+
+    ## Check all dependencies are present
+    MISSING=""
 }

-## FIXME:
-## In OSX, 'readlink -f' option does not exist, hence
-## we have our own readlink -f behaviour here.
-## Once OSX has the option, below function is good enough.
-## 
-## readlink() {
-##     return /bin/readlink -f "$1"
-## }
-##
 readlink() {
    TARGET_FILE=$1

@@ -57,114 +50,172 @@ readlink() {
    echo $RESULT
 }

-## FIXME:
-## In OSX, 'sort -V' option does not exist, hence
-## we have our own version compare function.
-## Once OSX has the option, below function is good enough.
-##
-## check_minimum_version() {
-##     versions=($(echo -e "$1\n$2" | sort -V))
-##     return [ "$1" == "${versions[0]}" ]
-## }
-##
-check_minimum_version() {
-    IFS='.' read -r -a varray1 <<< "$1"
-    IFS='.' read -r -a varray2 <<< "$2"
+###
+#
+# Takes two arguments
+# arg1: version number in `x.x.x` format
+# arg2: version number in `x.x.x` format
+#
+# example: check_version "$version1" "$version2"
+#
+# returns:
+# 0 - Installed version is equal to required
+# 1 - Installed version is greater than required
+# 2 - Installed version is lesser than required
+# 3 - If args have length zero
+#
+####
+check_version() {
+    ## validate args
+    [[ -z "$1" ]] && return 3
+    [[ -z "$2" ]] && return 3
+
+    if [[ $1 == $2 ]]; then
+        return 0
+    fi
+
+    local IFS=.
+    local i ver1=($1) ver2=($2)
+    # fill empty fields in ver1 with zeros
+    for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
+        ver1[i]=0
+    done
+    for ((i=0; i<${#ver1[@]}; i++)); do
+        if [[ -z ${ver2[i]} ]]; then
+            # fill empty fields in ver2 with zeros
+            ver2[i]=0
+        fi
+        if ((10#${ver1[i]} > 10#${ver2[i]})); then

-    for i in "${!varray1[@]}"; do
-        if [[ ${varray1[i]} -lt ${varray2[i]} ]]; then
-            return 0
-        elif [[ ${varray1[i]} -gt ${varray2[i]} ]]; then
            return 1
        fi
+        if ((10#${ver1[i]} < 10#${ver2[i]})); then
+            ## Installed version is lesser than required - Bad condition
+            return 2
+        fi
    done
-
    return 0
 }

-assert_is_supported_arch() {
-    case "${ARCH}" in
-        x86_64 | amd64 | aarch64 | arm* )
-            return
-            ;;
-        *)
-            echo "ERROR"
-            echo "Arch '${ARCH}' not supported."
-            echo "Supported Arch: [x86_64, amd64, aarch64, arm*]"
-            exit 1
-    esac
-}
-
-assert_is_supported_os() {
-    case "${KNAME}" in
-        Linux | FreeBSD )
-            return
-            ;;
-        Darwin )
-            osx_host_version=$(env sw_vers -productVersion)
-            if ! check_minimum_version "${OSX_VERSION}" "${osx_host_version}"; then
-                echo "ERROR"
-                echo "OSX version '${osx_host_version}' not supported."
-                echo "Minimum supported version: ${OSX_VERSION}"
-                exit 1
-            fi
-            return
-            ;;
-        *)
-            echo "ERROR"
-            echo "OS '${KNAME}' is not supported."
-            echo "Supported OS: [Linux, FreeBSD, Darwin]"
-            exit 1
-    esac
-}
-
-assert_check_golang_env() {
-    if ! which go >/dev/null 2>&1; then
+check_golang_env() {
+    echo ${GOROOT:?} 2>&1 >/dev/null
+    if [ $? -eq 1 ]; then
        echo "ERROR"
-        echo "Cannot find go binary in your PATH configuration, please refer to Go installation document at"
-        echo "https://docs.minio.io/docs/how-to-install-golang"
+        echo "GOROOT environment variable missing, please refer to Go installation document"
+        echo "https://github.com/minio/minio/blob/master/INSTALLGO.md#install-go-13"
        exit 1
    fi

-    installed_go_version=$(go version | sed 's/^.* go\([0-9.]*\).*$/\1/')
-    if ! check_minimum_version "${GO_VERSION}" "${installed_go_version}"; then
-        echo "ERROR"
-        echo "Go version '${installed_go_version}' not supported."
-        echo "Minimum supported version: ${GO_VERSION}"
-        exit 1
-    fi
-
-    if [ -z "${GOPATH}" ]; then
+    echo ${GOPATH:?} 2>&1 >/dev/null
+    if [ $? -eq 1 ]; then
        echo "ERROR"
        echo "GOPATH environment variable missing, please refer to Go installation document"
-        echo "https://docs.minio.io/docs/how-to-install-golang"
+        echo "https://github.com/minio/minio/blob/master/INSTALLGO.md#install-go-13"
        exit 1
    fi

+    local go_binary_path=$(which go)
+
+    if [ -z "${go_binary_path}" ] ; then
+        echo "Cannot find go binary in your PATH configuration, please refer to Go installation document"
+        echo "https://github.com/minio/minio/blob/master/INSTALLGO.md#install-go-13"
+        exit -1
+    fi
+
+    local new_go_binary_path=${go_binary_path}
+    if [ -h "${go_binary_path}" ]; then
+        new_go_binary_path=$(readlink ${go_binary_path})
+    fi
+
+    if [[ !"$(dirname ${new_go_binary_path})" =~ *"${GOROOT%%*(/)}"* ]] ; then
+        echo "The go binary found in your PATH configuration does not belong to the Go installation pointed by your GOROOT environment," \
+            "please refer to Go installation document"
+        echo "https://github.com/minio/minio/blob/master/INSTALLGO.md#install-go-13"
+        exit -1
+    fi
 }

-assert_check_deps() {
-    installed_git_version=$(git version | awk '{print $NF}')
-    if ! check_minimum_version "${GIT_VERSION}" "${installed_git_version}"; then
-        echo "ERROR"
-        echo "Git version '${installed_git_version}' not supported."
-        echo "Minimum supported version: ${GIT_VERSION}"
-        exit 1
+is_supported_os() {
+    case ${UNAME%% *} in
+        "Linux")
+            os="linux"
+            ;;
+        "FreeBSD")
+            os="freebsd"
+            ;;
+        "Darwin")
+            osx_host_version=$(env sw_vers -productVersion)
+            check_version "${osx_host_version}" "${OSX_VERSION}"
+            [[ $? -ge 2 ]] && die "Minimum OSX version supported is ${OSX_VERSION}"
+            ;;
+        "*")
+            echo "Exiting.. unsupported operating system found"
+            exit 1;
+    esac
+}
+
+is_supported_arch() {
+    local supported
+    case ${UNAME##* } in
+        "x86_64" | "amd64")
+            supported=1
+            ;;
+        "arm"*)
+            supported=1
+            ;;
+        *)
+            supported=0
+            ;;
+    esac
+    if [ $supported -eq 0 ]; then
+        echo "Invalid arch: ${UNAME} not supported, please use x86_64/amd64"
+        exit 1;
+    fi
+}
+
+check_deps() {
+    check_version "$(env go version 2>/dev/null | sed 's/^.* go\([0-9.]*\).*$/\1/')" "${GO_VERSION}"
+    if [ $? -ge 2 ]; then
+        MISSING="${MISSING} golang(${GO_VERSION})"
+    fi
+
+    check_version "$(env git --version 2>/dev/null | sed -e 's/^.* \([0-9.\].*\).*$/\1/' -e 's/^\([0-9.\]*\).*/\1/g')" "${GIT_VERSION}"
+    if [ $? -ge 2 ]; then
+        MISSING="${MISSING} git"
    fi
 }

 main() {
-    ## Check for supported arch
-    assert_is_supported_arch
+    echo -n "Check for supported arch.. "
+    is_supported_arch

-    ## Check for supported os
-    assert_is_supported_os
+    echo -n "Check for supported os.. "
+    is_supported_os

-    ## Check for Go environment
-    assert_check_golang_env
+    echo -n "Checking if proper environment variables are set.. "
+    check_golang_env

-    ## Check for dependencies
-    assert_check_deps
+    echo "Done"
+    echo "Using GOPATH=${GOPATH} and GOROOT=${GOROOT}"
+
+    echo -n "Checking dependencies for Minio.. "
+    check_deps
+
+    ## If dependencies are missing, warn the user and abort
+    if [ "x${MISSING}" != "x" ]; then
+        echo "ERROR"
+        echo
+        echo "The following build tools are missing:"
+        echo
+        echo "** ${MISSING} **"
+        echo
+        echo "Please install them "
+        echo "${MISSING}"
+        echo
+        echo "Follow https://docs.minio.io/docs/how-to-install-golang for further instructions"
+        exit 1
+    fi
+    echo "Done"
 }

 _init && main "$@"
@@ -15,23 +15,26 @@
 # limitations under the License.
 #

-main() {
-    echo "Checking project is in GOPATH:"
+_init() {

-    IFS=':' read -r -a paths <<< "$GOPATH"
-    for path in "${paths[@]}"; do
-        minio_path="$path/src/github.com/minio/minio"
-        if [ -d "$minio_path" ]; then
-            if [ "$minio_path" -ef "$PWD" ]; then
-               exit 0
-            fi
-        fi
-    done
+    shopt -s extglob

-    echo "ERROR"
-    echo "Project not found in ${GOPATH}."
-    echo "Follow instructions at https://github.com/minio/minio/blob/master/CONTRIBUTING.md#setup-your-minio-github-repository"
-    exit 1
+    PWD=$(pwd -P)
+    GOPATH=$(cd "$(go env GOPATH)" ; env pwd -P)
 }

-main
+main() {
+    echo "Checking if project is at ${GOPATH}"
+    for minio in $(echo ${GOPATH} | tr ':' ' '); do
+        if [ ! -d ${minio}/src/github.com/minio/minio ]; then
+            echo "Project not found in ${minio}, please follow instructions provided at https://github.com/minio/minio/blob/master/CONTRIBUTING.md#setup-your-minio-github-repository" \
+                && exit 1
+        fi
+        if [ "x${minio}/src/github.com/minio/minio" != "x${PWD}" ]; then
+            echo "Build outside of ${minio}, two source checkouts found. Exiting." && exit 1
+        fi
+    done
+}
+
+_init && main
+
@@ -19,6 +19,7 @@ package cmd
 import (
 	"crypto/rand"
 	"encoding/base64"
+	"regexp"
 )

 // credential container for access and secret keys.
@@ -28,21 +29,15 @@ type credential struct {
 }

 const (
-	accessKeyMinLen = 5
-	accessKeyMaxLen = 20
-	secretKeyMinLen = 8
-	secretKeyMaxLen = 40
+	minioAccessID = 20
+	minioSecretID = 40
 )

-// isValidAccessKey - validate access key for right length.
-func isValidAccessKey(accessKey string) bool {
-	return len(accessKey) >= accessKeyMinLen && len(accessKey) <= accessKeyMaxLen
-}
+// isValidSecretKey - validate secret key.
+var isValidSecretKey = regexp.MustCompile(`^.{8,40}$`)

-// isValidSecretKey - validate secret key for right length.
-func isValidSecretKey(secretKey string) bool {
-	return len(secretKey) >= secretKeyMinLen && len(secretKey) <= secretKeyMaxLen
-}
+// isValidAccessKey - validate access key.
+var isValidAccessKey = regexp.MustCompile(`^[a-zA-Z0-9\\-\\.\\_\\~]{5,20}$`)

 // mustGenAccessKeys - must generate access credentials.
 func mustGenAccessKeys() (creds credential) {
@@ -71,11 +66,11 @@ func genAccessKeys() (credential, error) {
 // genAccessKeyID - generate random alpha numeric value using only uppercase characters
 // takes input as size in integer
 func genAccessKeyID() ([]byte, error) {
-	alpha := make([]byte, accessKeyMaxLen)
+	alpha := make([]byte, minioAccessID)
 	if _, err := rand.Read(alpha); err != nil {
 		return nil, err
 	}
-	for i := 0; i < accessKeyMaxLen; i++ {
+	for i := 0; i < minioAccessID; i++ {
 		alpha[i] = alphaNumericTable[alpha[i]%byte(len(alphaNumericTable))]
 	}
 	return alpha, nil
@@ -83,9 +78,9 @@ func genAccessKeyID() ([]byte, error) {

 // genSecretAccessKey - generate random base64 numeric value from a random seed.
 func genSecretAccessKey() ([]byte, error) {
-	rb := make([]byte, secretKeyMaxLen)
+	rb := make([]byte, minioSecretID)
 	if _, err := rand.Read(rb); err != nil {
 		return nil, err
 	}
-	return []byte(base64.StdEncoding.EncodeToString(rb))[:secretKeyMaxLen], nil
+	return []byte(base64.StdEncoding.EncodeToString(rb))[:minioSecretID], nil
 }
@@ -28,7 +28,7 @@ type ObjectIdentifier struct {
 // createBucketConfiguration container for bucket configuration request from client.
 // Used for parsing the location from the request body for MakeBucketbucket.
 type createBucketLocationConfiguration struct {
-	XMLName  xml.Name `xml:"CreateBucketConfiguration" json:"-"`
+	XMLName  xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ CreateBucketConfiguration" json:"-"`
 	Location string   `xml:"LocationConstraint"`
 }

@@ -48,6 +48,7 @@ const (
 	ErrNone APIErrorCode = iota
 	ErrAccessDenied
 	ErrBadDigest
+	ErrBucketAlreadyExists
 	ErrEntityTooSmall
 	ErrEntityTooLarge
 	ErrIncompleteBody
@@ -64,7 +65,6 @@ const (
 	ErrInvalidCopySource
 	ErrInvalidCopyDest
 	ErrInvalidPolicyDocument
-	ErrInvalidObjectState
 	ErrMalformedXML
 	ErrMissingContentLength
 	ErrMissingContentMD5
@@ -134,7 +134,6 @@ const (
 	ErrObjectExistsAsDirectory
 	ErrPolicyNesting
 	ErrInvalidObjectName
-	ErrServerNotInitialized
 	// Add new extended error codes here.
 	// Please open a https://github.com/minio/minio/issues before adding
 	// new error codes here.
@@ -193,6 +192,11 @@ var errorCodeResponse = map[APIErrorCode]APIError{
 		Description:    "The Content-Md5 you specified did not match what we received.",
 		HTTPStatusCode: http.StatusBadRequest,
 	},
+	ErrBucketAlreadyExists: {
+		Code:           "BucketAlreadyExists",
+		Description:    "The requested bucket name is not available.",
+		HTTPStatusCode: http.StatusConflict,
+	},
 	ErrEntityTooSmall: {
 		Code:           "EntityTooSmall",
 		Description:    "Your proposed upload is smaller than the minimum allowed object size.",
@@ -308,11 +312,6 @@ var errorCodeResponse = map[APIErrorCode]APIError{
 		Description:    "The list of parts was not in ascending order. The parts list must be specified in order by part number.",
 		HTTPStatusCode: http.StatusBadRequest,
 	},
-	ErrInvalidObjectState: {
-		Code:           "InvalidObjectState",
-		Description:    "The operation is not valid for the current state of the object.",
-		HTTPStatusCode: http.StatusForbidden,
-	},
 	ErrAuthorizationHeaderMalformed: {
 		Code:           "AuthorizationHeaderMalformed",
 		Description:    "The authorization header is malformed; the region is wrong; expecting 'us-east-1'.",
@@ -455,7 +454,7 @@ var errorCodeResponse = map[APIErrorCode]APIError{
 		Description:    "Request is not valid yet",
 		HTTPStatusCode: http.StatusForbidden,
 	},
-	// FIXME: Actual XML error response also contains the header which missed in list of signed header parameters.
+	// FIXME: Actual XML error response also contains the header which missed in lsit of signed header parameters.
 	ErrUnsignedHeaders: {
 		Code:           "AccessDenied",
 		Description:    "There were headers present in the request which were not signed",
@@ -549,7 +548,7 @@ var errorCodeResponse = map[APIErrorCode]APIError{
 	},
 	ErrPolicyNesting: {
 		Code:           "XMinioPolicyNesting",
-		Description:    "New bucket policy conflicts with an existing policy. Please try again with new prefix.",
+		Description:    "Policy nesting conflict has occurred.",
 		HTTPStatusCode: http.StatusConflict,
 	},
 	ErrInvalidObjectName: {
@@ -557,11 +556,6 @@ var errorCodeResponse = map[APIErrorCode]APIError{
 		Description:    "Object name contains unsupported characters. Unsupported characters are `^*|\\\"",
 		HTTPStatusCode: http.StatusBadRequest,
 	},
-	ErrServerNotInitialized: {
-		Code:           "XMinioServerNotInitialized",
-		Description:    "Server not initialized, please try again.",
-		HTTPStatusCode: http.StatusServiceUnavailable,
-	},
 	// Add your error structure here.
 }

@@ -572,8 +566,6 @@ func toAPIErrorCode(err error) (apiErr APIErrorCode) {
 	if err == nil {
 		return ErrNone
 	}
-
-	err = errorCause(err)
 	// Verify if the underlying error is signature mismatch.
 	switch err {
 	case errSignatureMismatch:
@@ -581,12 +573,10 @@ func toAPIErrorCode(err error) (apiErr APIErrorCode) {
 	case errContentSHA256Mismatch:
 		apiErr = ErrContentSHA256Mismatch
 	}
-
 	if apiErr != ErrNone {
 		// If there was a match in the above switch case.
 		return apiErr
 	}
-
 	switch err.(type) {
 	case StorageFull:
 		apiErr = ErrStorageFull
@@ -596,8 +586,6 @@ func toAPIErrorCode(err error) (apiErr APIErrorCode) {
 		apiErr = ErrIncompleteBody
 	case ObjectExistsAsDirectory:
 		apiErr = ErrObjectExistsAsDirectory
-	case PrefixAccessDenied:
-		apiErr = ErrAccessDenied
 	case BucketNameInvalid:
 		apiErr = ErrInvalidBucketName
 	case BucketNotFound:
@@ -618,26 +606,11 @@ func toAPIErrorCode(err error) (apiErr APIErrorCode) {
 		apiErr = ErrWriteQuorum
 	case InsufficientReadQuorum:
 		apiErr = ErrReadQuorum
-	case UnsupportedDelimiter:
-		apiErr = ErrNotImplemented
-	case InvalidMarkerPrefixCombination:
-		apiErr = ErrNotImplemented
-	case InvalidUploadIDKeyCombination:
-		apiErr = ErrNotImplemented
-	case MalformedUploadID:
-		apiErr = ErrNoSuchUpload
 	case PartTooSmall:
 		apiErr = ErrEntityTooSmall
-	case SHA256Mismatch:
-		apiErr = ErrContentSHA256Mismatch
-	case ObjectTooLarge:
-		apiErr = ErrEntityTooLarge
-	case ObjectTooSmall:
-		apiErr = ErrEntityTooSmall
 	default:
 		apiErr = ErrInternalError
 	}
-
 	return apiErr
 }

@@ -661,3 +634,7 @@ func getAPIErrorResponse(err APIError, resource string) APIErrorResponse {

 	return data
 }
+
+func getErrMalformedCredentialDate(malformedDateStr string) {
+
+}
@@ -1,135 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"errors"
-	"testing"
-)
-
-func TestAPIErrCode(t *testing.T) {
-	testCases := []struct {
-		err     error
-		errCode APIErrorCode
-	}{
-		// Valid cases.
-		{
-			BadDigest{},
-			ErrBadDigest,
-		},
-		{
-			IncompleteBody{},
-			ErrIncompleteBody,
-		},
-		{
-			ObjectExistsAsDirectory{},
-			ErrObjectExistsAsDirectory,
-		},
-		{
-			BucketNameInvalid{},
-			ErrInvalidBucketName,
-		},
-		{
-			BucketExists{},
-			ErrBucketAlreadyOwnedByYou,
-		},
-		{
-			ObjectNotFound{},
-			ErrNoSuchKey,
-		},
-		{
-			ObjectNameInvalid{},
-			ErrInvalidObjectName,
-		},
-		{
-			InvalidUploadID{},
-			ErrNoSuchUpload,
-		},
-		{
-			InvalidPart{},
-			ErrInvalidPart,
-		},
-		{
-			InsufficientReadQuorum{},
-			ErrReadQuorum,
-		},
-		{
-			InsufficientWriteQuorum{},
-			ErrWriteQuorum,
-		},
-		{
-			UnsupportedDelimiter{},
-			ErrNotImplemented,
-		},
-		{
-			InvalidMarkerPrefixCombination{},
-			ErrNotImplemented,
-		},
-		{
-			InvalidUploadIDKeyCombination{},
-			ErrNotImplemented,
-		},
-		{
-			MalformedUploadID{},
-			ErrNoSuchUpload,
-		},
-		{
-			PartTooSmall{},
-			ErrEntityTooSmall,
-		},
-		{
-			BucketNotEmpty{},
-			ErrBucketNotEmpty,
-		},
-		{
-			BucketNotFound{},
-			ErrNoSuchBucket,
-		},
-		{
-			StorageFull{},
-			ErrStorageFull,
-		},
-		{
-			errSignatureMismatch,
-			ErrSignatureDoesNotMatch,
-		},
-		{
-			errContentSHA256Mismatch,
-			ErrContentSHA256Mismatch,
-		}, // End of all valid cases.
-
-		// Case where err is nil.
-		{
-			nil,
-			ErrNone,
-		},
-
-		// Case where err type is unknown.
-		{
-			errors.New("Custom error"),
-			ErrInternalError,
-		},
-	}
-
-	// Validate all the errors with their API error codes.
-	for i, testCase := range testCases {
-		errCode := toAPIErrorCode(testCase.err)
-		if errCode != testCase.errCode {
-			t.Errorf("Test %d: Expected error code %d, got %d", i+1, testCase.errCode, errCode)
-		}
-	}
-}
@@ -1,5 +1,5 @@
 /*
- * Minio Cloud Storage, (C) 2015,2016 Minio, Inc.
+ * Minio Cloud Storage, (C) 2015 Minio, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,23 +25,25 @@ import (
 	"strconv"
 )

-// Static alphanumeric table used for generating unique request ids
+//// helpers
+
+// Static alphaNumeric table used for generating unique request ids
 var alphaNumericTable = []byte("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ")

-// newRequestID generates and returns request ID string.
-func newRequestID() string {
+// generateRequestID - Generate request id
+func generateRequestID() []byte {
 	alpha := make([]byte, 16)
 	rand.Read(alpha)
 	for i := 0; i < 16; i++ {
 		alpha[i] = alphaNumericTable[alpha[i]%byte(len(alphaNumericTable))]
 	}
-	return string(alpha)
+	return alpha
 }

 // Write http common headers
 func setCommonHeaders(w http.ResponseWriter) {
 	// Set unique request ID for each reply.
-	w.Header().Set("X-Amz-Request-Id", newRequestID())
+	w.Header().Set("X-Amz-Request-Id", string(generateRequestID()))
 	w.Header().Set("Server", ("Minio/" + ReleaseTag + " (" + runtime.GOOS + "; " + runtime.GOARCH + ")"))
 	w.Header().Set("Accept-Ranges", "bytes")
 }
@@ -20,9 +20,9 @@ import (
 	"testing"
 )

-func TestNewRequestID(t *testing.T) {
+func TestGenerateRequestID(t *testing.T) {
 	// Ensure that it returns an alphanumeric result of length 16.
-	var id = newRequestID()
+	var id = generateRequestID()

 	if len(id) != 16 {
 		t.Fail()
@@ -38,7 +38,6 @@ func getListObjectsV1Args(values url.Values) (prefix, marker, delimiter string,
 // Parse bucket url queries for ListObjects V2.
 func getListObjectsV2Args(values url.Values) (prefix, token, startAfter, delimiter string, fetchOwner bool, maxkeys int, encodingType string) {
 	prefix = values.Get("prefix")
-	token = values.Get("continuation-token")
 	startAfter = values.Get("start-after")
 	delimiter = values.Get("delimiter")
 	if values.Get("max-keys") != "" {
@@ -46,8 +45,11 @@ func getListObjectsV2Args(values url.Values) (prefix, token, startAfter, delimit
 	} else {
 		maxkeys = maxObjectList
 	}
-	fetchOwner = values.Get("fetch-owner") == "true"
 	encodingType = values.Get("encoding-type")
+	token = values.Get("continuation-token")
+	if values.Get("fetch-owner") == "true" {
+		fetchOwner = true
+	}
 	return
 }

@@ -78,21 +80,3 @@ func getObjectResources(values url.Values) (uploadID string, partNumberMarker, m
 	encodingType = values.Get("encoding-type")
 	return
 }
-
-// Parse listen bucket notification resources.
-func getListenBucketNotificationResources(values url.Values) (prefix []string, suffix []string, events []string) {
-	prefix = values["prefix"]
-	suffix = values["suffix"]
-	events = values["events"]
-	return prefix, suffix, events
-}
-
-// Validates filter values
-func validateFilterValues(values []string) (err APIErrorCode) {
-	for _, value := range values {
-		if !IsValidObjectPrefix(value) {
-			return ErrFilterValueInvalid
-		}
-	}
-	return ErrNone
-}
@@ -1,226 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"net/url"
-	"strings"
-	"testing"
-)
-
-// Test list objects resources V2.
-func TestListObjectsV2Resources(t *testing.T) {
-	testCases := []struct {
-		values                               url.Values
-		prefix, token, startAfter, delimiter string
-		fetchOwner                           bool
-		maxKeys                              int
-		encodingType                         string
-	}{
-		{
-			values: url.Values{
-				"prefix":             []string{"photos/"},
-				"continuation-token": []string{"token"},
-				"start-after":        []string{"start-after"},
-				"delimiter":          []string{"/"},
-				"fetch-owner":        []string{"true"},
-				"max-keys":           []string{"100"},
-				"encoding-type":      []string{"gzip"},
-			},
-			prefix:       "photos/",
-			token:        "token",
-			startAfter:   "start-after",
-			delimiter:    "/",
-			fetchOwner:   true,
-			maxKeys:      100,
-			encodingType: "gzip",
-		},
-		{
-			values: url.Values{
-				"prefix":             []string{"photos/"},
-				"continuation-token": []string{"token"},
-				"start-after":        []string{"start-after"},
-				"delimiter":          []string{"/"},
-				"fetch-owner":        []string{"true"},
-				"encoding-type":      []string{"gzip"},
-			},
-			prefix:       "photos/",
-			token:        "token",
-			startAfter:   "start-after",
-			delimiter:    "/",
-			fetchOwner:   true,
-			maxKeys:      1000,
-			encodingType: "gzip",
-		},
-	}
-
-	for i, testCase := range testCases {
-		prefix, token, startAfter, delimiter, fetchOwner, maxKeys, encodingType := getListObjectsV2Args(testCase.values)
-		if prefix != testCase.prefix {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.prefix, prefix)
-		}
-		if token != testCase.token {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.token, token)
-		}
-		if startAfter != testCase.startAfter {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.startAfter, startAfter)
-		}
-		if delimiter != testCase.delimiter {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.delimiter, delimiter)
-		}
-		if fetchOwner != testCase.fetchOwner {
-			t.Errorf("Test %d: Expected %t, got %t", i+1, testCase.fetchOwner, fetchOwner)
-		}
-		if maxKeys != testCase.maxKeys {
-			t.Errorf("Test %d: Expected %d, got %d", i+1, testCase.maxKeys, maxKeys)
-		}
-		if encodingType != testCase.encodingType {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.encodingType, encodingType)
-		}
-	}
-}
-
-// Test list objects resources V1.
-func TestListObjectsV1Resources(t *testing.T) {
-	testCases := []struct {
-		values                    url.Values
-		prefix, marker, delimiter string
-		maxKeys                   int
-		encodingType              string
-	}{
-		{
-			values: url.Values{
-				"prefix":        []string{"photos/"},
-				"marker":        []string{"test"},
-				"delimiter":     []string{"/"},
-				"max-keys":      []string{"100"},
-				"encoding-type": []string{"gzip"},
-			},
-			prefix:       "photos/",
-			marker:       "test",
-			delimiter:    "/",
-			maxKeys:      100,
-			encodingType: "gzip",
-		},
-		{
-			values: url.Values{
-				"prefix":        []string{"photos/"},
-				"marker":        []string{"test"},
-				"delimiter":     []string{"/"},
-				"encoding-type": []string{"gzip"},
-			},
-			prefix:       "photos/",
-			marker:       "test",
-			delimiter:    "/",
-			maxKeys:      1000,
-			encodingType: "gzip",
-		},
-	}
-
-	for i, testCase := range testCases {
-		prefix, marker, delimiter, maxKeys, encodingType := getListObjectsV1Args(testCase.values)
-		if prefix != testCase.prefix {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.prefix, prefix)
-		}
-		if marker != testCase.marker {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.marker, marker)
-		}
-		if delimiter != testCase.delimiter {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.delimiter, delimiter)
-		}
-		if maxKeys != testCase.maxKeys {
-			t.Errorf("Test %d: Expected %d, got %d", i+1, testCase.maxKeys, maxKeys)
-		}
-		if encodingType != testCase.encodingType {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.encodingType, encodingType)
-		}
-	}
-}
-
-// Validates extracting information for object resources.
-func TestGetObjectsResources(t *testing.T) {
-	testCases := []struct {
-		values                     url.Values
-		uploadID                   string
-		partNumberMarker, maxParts int
-		encodingType               string
-	}{
-		{
-			values: url.Values{
-				"uploadId":           []string{"11123-11312312311231-12313"},
-				"part-number-marker": []string{"1"},
-				"max-parts":          []string{"1000"},
-				"encoding-type":      []string{"gzip"},
-			},
-			uploadID:         "11123-11312312311231-12313",
-			partNumberMarker: 1,
-			maxParts:         1000,
-			encodingType:     "gzip",
-		},
-	}
-
-	for i, testCase := range testCases {
-		uploadID, partNumberMarker, maxParts, encodingType := getObjectResources(testCase.values)
-		if uploadID != testCase.uploadID {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.uploadID, uploadID)
-		}
-		if partNumberMarker != testCase.partNumberMarker {
-			t.Errorf("Test %d: Expected %d, got %d", i+1, testCase.partNumberMarker, partNumberMarker)
-		}
-		if maxParts != testCase.maxParts {
-			t.Errorf("Test %d: Expected %d, got %d", i+1, testCase.maxParts, maxParts)
-		}
-		if encodingType != testCase.encodingType {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.encodingType, encodingType)
-		}
-	}
-}
-
-// Validates if filter values are correct
-func TestValidateFilterValues(t *testing.T) {
-	testCases := []struct {
-		values        []string
-		expectedError APIErrorCode
-	}{
-		{
-			values:        []string{""},
-			expectedError: ErrNone,
-		},
-		{
-			values:        []string{"", "prefix"},
-			expectedError: ErrNone,
-		},
-		{
-			values:        []string{strings.Repeat("a", 1025)},
-			expectedError: ErrFilterValueInvalid,
-		},
-		{
-			values:        []string{"a\\b"},
-			expectedError: ErrFilterValueInvalid,
-		},
-		{
-			values:        []string{string([]byte{0xff, 0xfe, 0xfd})},
-			expectedError: ErrFilterValueInvalid,
-		},
-	}
-
-	for i, testCase := range testCases {
-		if actualError := validateFilterValues(testCase.values); actualError != testCase.expectedError {
-			t.Errorf("Test %d: Expected %d, got %d", i+1, testCase.expectedError, actualError)
-		}
-	}
-}
@@ -14,25 +14,12 @@
 * limitations under the License.
 */

+// Package cmd file carries any specific responses constructed/necessary in
+// multipart operations.
 package cmd

 import "net/http"

-// Represents additional fields necessary for ErrPartTooSmall S3 error.
-type completeMultipartAPIError struct {
-	// Proposed size represents uploaded size of the part.
-	ProposedSize int64
-	// Minimum size allowed epresents the minimum size allowed per
-	// part. Defaults to 5MB.
-	MinSizeAllowed int64
-	// Part number of the part which is incorrect.
-	PartNumber int
-	// ETag of the part which is incorrect.
-	PartETag string
-	// Other default XML error responses.
-	APIErrorResponse
-}
-
 // writeErrorResponsePartTooSmall - function is used specifically to
 // construct a proper error response during CompleteMultipartUpload
 // when one of the parts is < 5MB.
@@ -41,16 +28,27 @@ type completeMultipartAPIError struct {
 // error. So we construct a new type which lies well within the scope
 // of this function.
 func writePartSmallErrorResponse(w http.ResponseWriter, r *http.Request, err PartTooSmall) {
-
-	apiError := getAPIError(toAPIErrorCode(err))
+	// Represents additional fields necessary for ErrPartTooSmall S3 error.
+	type completeMultipartAPIError struct {
+		// Proposed size represents uploaded size of the part.
+		ProposedSize int64
+		// Minimum size allowed epresents the minimum size allowed per
+		// part. Defaults to 5MB.
+		MinSizeAllowed int64
+		// Part number of the part which is incorrect.
+		PartNumber int
+		// ETag of the part which is incorrect.
+		PartETag string
+		// Other default XML error responses.
+		APIErrorResponse
+	}
 	// Generate complete multipart error response.
-	errorResponse := getAPIErrorResponse(apiError, r.URL.Path)
+	errorResponse := getAPIErrorResponse(getAPIError(toAPIErrorCode(err)), r.URL.Path)
 	cmpErrResp := completeMultipartAPIError{err.PartSize, int64(5242880), err.PartNumber, err.PartETag, errorResponse}
 	encodedErrorResponse := encodeResponse(cmpErrResp)
-
-	// respond with 400 bad request.
-	w.WriteHeader(apiError.HTTPStatusCode)
-	// Write error body.
+	// Write error body
 	w.Write(encodedErrorResponse)
 	w.(http.Flusher).Flush()
 }
+
+// Add any other multipart specific responses here.
@@ -24,11 +24,10 @@ import (
 )

 const (
-	timeFormatAMZ     = "2006-01-02T15:04:05Z"     // Reply date format
-	timeFormatAMZLong = "2006-01-02T15:04:05.000Z" // Reply date format with nanosecond precision.
-	maxObjectList     = 1000                       // Limit number of objects in a listObjectsResponse.
-	maxUploadsList    = 1000                       // Limit number of uploads in a listUploadsResponse.
-	maxPartsList      = 1000                       // Limit number of parts in a listPartsResponse.
+	timeFormatAMZ  = "2006-01-02T15:04:05.000Z" // Reply date format
+	maxObjectList  = 1000                       // Limit number of objects in a listObjectsResponse.
+	maxUploadsList = 1000                       // Limit number of uploads in a listUploadsResponse.
+	maxPartsList   = 1000                       // Limit number of parts in a listPartsResponse.
 )

 // LocationResponse - format for location response.
@@ -41,9 +40,20 @@ type LocationResponse struct {
 type ListObjectsResponse struct {
 	XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListBucketResult" json:"-"`

-	Name   string
-	Prefix string
-	Marker string
+	CommonPrefixes []CommonPrefix
+	Contents       []Object
+
+	Delimiter string
+
+	// Encoding type used to encode object keys in the response.
+	EncodingType string
+
+	// A flag that indicates whether or not ListObjects returned all of the results
+	// that satisfied the search criteria.
+	IsTruncated bool
+	Marker      string
+	MaxKeys     int
+	Name        string

 	// When response is truncated (the IsTruncated element value in the response
 	// is true), you can use the key name in this field as marker in the subsequent
@@ -52,28 +62,29 @@ type ListObjectsResponse struct {
 	// specified. If response does not include the NextMaker and it is truncated,
 	// you can use the value of the last Key in the response as the marker in the
 	// subsequent request to get the next set of object keys.
-	NextMarker string `xml:"NextMarker,omitempty"`
-
-	MaxKeys   int
-	Delimiter string
-	// A flag that indicates whether or not ListObjects returned all of the results
-	// that satisfied the search criteria.
-	IsTruncated bool
-
-	Contents       []Object
-	CommonPrefixes []CommonPrefix
-
-	// Encoding type used to encode object keys in the response.
-	EncodingType string `xml:"EncodingType,omitempty"`
+	NextMarker string
+	Prefix     string
 }

 // ListObjectsV2Response - format for list objects response.
 type ListObjectsV2Response struct {
 	XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListBucketResult" json:"-"`

-	Name       string
-	Prefix     string
-	StartAfter string `xml:"StartAfter,omitempty"`
+	CommonPrefixes []CommonPrefix
+	Contents       []Object
+
+	Delimiter string
+
+	// Encoding type used to encode object keys in the response.
+	EncodingType string
+
+	// A flag that indicates whether or not ListObjects returned all of the results
+	// that satisfied the search criteria.
+	IsTruncated bool
+	StartAfter  string
+	MaxKeys     int
+	Name        string
+
 	// When response is truncated (the IsTruncated element value in the response
 	// is true), you can use the key name in this field as marker in the subsequent
 	// request to get next set of objects. Server lists objects in alphabetical
@@ -81,28 +92,16 @@ type ListObjectsV2Response struct {
 	// specified. If response does not include the NextMaker and it is truncated,
 	// you can use the value of the last Key in the response as the marker in the
 	// subsequent request to get the next set of object keys.
-	ContinuationToken     string `xml:"ContinuationToken,omitempty"`
-	NextContinuationToken string `xml:"NextContinuationToken,omitempty"`
-
-	KeyCount  int
-	MaxKeys   int
-	Delimiter string
-	// A flag that indicates whether or not ListObjects returned all of the results
-	// that satisfied the search criteria.
-	IsTruncated bool
-
-	Contents       []Object
-	CommonPrefixes []CommonPrefix
-
-	// Encoding type used to encode object keys in the response.
-	EncodingType string `xml:"EncodingType,omitempty"`
+	ContinuationToken     string
+	NextContinuationToken string
+	Prefix                string
 }

 // Part container for part metadata.
 type Part struct {
 	PartNumber   int
-	LastModified string
 	ETag         string
+	LastModified string
 	Size         int64
 }

@@ -138,29 +137,23 @@ type ListMultipartUploadsResponse struct {
 	UploadIDMarker     string `xml:"UploadIdMarker"`
 	NextKeyMarker      string
 	NextUploadIDMarker string `xml:"NextUploadIdMarker"`
-	Delimiter          string
-	Prefix             string
-	EncodingType       string `xml:"EncodingType,omitempty"`
+	EncodingType       string
 	MaxUploads         int
 	IsTruncated        bool
-
-	// List of pending uploads.
-	Uploads []Upload `xml:"Upload"`
-
-	// Delimed common prefixes.
-	CommonPrefixes []CommonPrefix
+	Uploads            []Upload `xml:"Upload"`
+	Prefix             string
+	Delimiter          string
+	CommonPrefixes     []CommonPrefix
 }

 // ListBucketsResponse - format for list buckets response
 type ListBucketsResponse struct {
 	XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListAllMyBucketsResult" json:"-"`
-
-	Owner Owner
-
 	// Container for one or more buckets.
 	Buckets struct {
 		Buckets []Bucket `xml:"Bucket"`
 	} // Buckets are nested
+	Owner Owner
 }

 // Upload container for in progress multipart upload
@@ -186,23 +179,23 @@ type Bucket struct {

 // Object container for object metadata
 type Object struct {
+	ETag         string
 	Key          string
 	LastModified string // time string of format "2006-01-02T15:04:05.000Z"
-	ETag         string
 	Size         int64

-	// Owner of the object.
 	Owner Owner

 	// The class of storage used to store the object.
 	StorageClass string
 }

-// CopyObjectResponse container returns ETag and LastModified of the successfully copied object
+// CopyObjectResponse container returns ETag and LastModified of the
+// successfully copied object
 type CopyObjectResponse struct {
 	XMLName      xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ CopyObjectResult" json:"-"`
-	LastModified string   // time string of format "2006-01-02T15:04:05.000Z"
-	ETag         string   // md5sum of the copied object.
+	ETag         string
+	LastModified string // time string of format "2006-01-02T15:04:05.000Z"
 }

 // Initiator inherit from Owner struct, fields are same
@@ -261,8 +254,12 @@ func getObjectLocation(bucketName string, key string) string {
 	return "/" + bucketName + "/" + key
 }

-// generates ListBucketsResponse from array of BucketInfo which can be
-// serialized to match XML and JSON API spec output.
+// takes an array of Bucketmetadata information for serialization
+// input:
+// array of bucket metadata
+//
+// output:
+// populated struct that can be serialized to match xml and json api spec output
 func generateListBucketsResponse(buckets []BucketInfo) ListBucketsResponse {
 	var listbuckets []Bucket
 	var data = ListBucketsResponse{}
@@ -274,7 +271,7 @@ func generateListBucketsResponse(buckets []BucketInfo) ListBucketsResponse {
 	for _, bucket := range buckets {
 		var listbucket = Bucket{}
 		listbucket.Name = bucket.Name
-		listbucket.CreationDate = bucket.Created.Format(timeFormatAMZLong)
+		listbucket.CreationDate = bucket.Created.Format(timeFormatAMZ)
 		listbuckets = append(listbuckets, listbucket)
 	}

@@ -300,7 +297,7 @@ func generateListObjectsV1Response(bucket, prefix, marker, delimiter string, max
 			continue
 		}
 		content.Key = object.Name
-		content.LastModified = object.ModTime.UTC().Format(timeFormatAMZLong)
+		content.LastModified = object.ModTime.UTC().Format(timeFormatAMZ)
 		if object.MD5Sum != "" {
 			content.ETag = "\"" + object.MD5Sum + "\""
 		}
@@ -347,7 +344,7 @@ func generateListObjectsV2Response(bucket, prefix, token, startAfter, delimiter
 			continue
 		}
 		content.Key = object.Name
-		content.LastModified = object.ModTime.UTC().Format(timeFormatAMZLong)
+		content.LastModified = object.ModTime.UTC().Format(timeFormatAMZ)
 		if object.MD5Sum != "" {
 			content.ETag = "\"" + object.MD5Sum + "\""
 		}
@@ -373,19 +370,18 @@ func generateListObjectsV2Response(bucket, prefix, token, startAfter, delimiter
 		prefixes = append(prefixes, prefixItem)
 	}
 	data.CommonPrefixes = prefixes
-	data.KeyCount = len(data.Contents) + len(data.CommonPrefixes)
 	return data
 }

-// generates CopyObjectResponse from etag and lastModified time.
+// generateCopyObjectResponse
 func generateCopyObjectResponse(etag string, lastModified time.Time) CopyObjectResponse {
 	return CopyObjectResponse{
 		ETag:         "\"" + etag + "\"",
-		LastModified: lastModified.UTC().Format(timeFormatAMZLong),
+		LastModified: lastModified.UTC().Format(timeFormatAMZ),
 	}
 }

-// generates InitiateMultipartUploadResponse for given bucket, key and uploadID.
+// generateInitiateMultipartUploadResponse
 func generateInitiateMultipartUploadResponse(bucket, key, uploadID string) InitiateMultipartUploadResponse {
 	return InitiateMultipartUploadResponse{
 		Bucket:   bucket,
@@ -394,7 +390,7 @@ func generateInitiateMultipartUploadResponse(bucket, key, uploadID string) Initi
 	}
 }

-// generates CompleteMultipartUploadResponse for given bucket, key, location and ETag.
+// generateCompleteMultipartUploadResponse
 func generateCompleteMultpartUploadResponse(bucket, key, location, etag string) CompleteMultipartUploadResponse {
 	return CompleteMultipartUploadResponse{
 		Location: location,
@@ -404,7 +400,7 @@ func generateCompleteMultpartUploadResponse(bucket, key, location, etag string)
 	}
 }

-// generates ListPartsResponse from ListPartsInfo.
+// generateListPartsResult
 func generateListPartsResponse(partsInfo ListPartsInfo) ListPartsResponse {
 	// TODO - support EncodingType in xml decoding
 	listPartsResponse := ListPartsResponse{}
@@ -428,13 +424,13 @@ func generateListPartsResponse(partsInfo ListPartsInfo) ListPartsResponse {
 		newPart.PartNumber = part.PartNumber
 		newPart.ETag = "\"" + part.ETag + "\""
 		newPart.Size = part.Size
-		newPart.LastModified = part.LastModified.UTC().Format(timeFormatAMZLong)
+		newPart.LastModified = part.LastModified.UTC().Format(timeFormatAMZ)
 		listPartsResponse.Parts[index] = newPart
 	}
 	return listPartsResponse
 }

-// generates ListMultipartUploadsResponse for given bucket and ListMultipartsInfo.
+// generateListMultipartUploadsResponse
 func generateListMultipartUploadsResponse(bucket string, multipartsInfo ListMultipartsInfo) ListMultipartUploadsResponse {
 	listMultipartUploadsResponse := ListMultipartUploadsResponse{}
 	listMultipartUploadsResponse.Bucket = bucket
@@ -458,7 +454,7 @@ func generateListMultipartUploadsResponse(bucket string, multipartsInfo ListMult
 		newUpload := Upload{}
 		newUpload.UploadID = upload.UploadID
 		newUpload.Key = upload.Object
-		newUpload.Initiated = upload.Initiated.UTC().Format(timeFormatAMZLong)
+		newUpload.Initiated = upload.Initiated.UTC().Format(timeFormatAMZ)
 		listMultipartUploadsResponse.Uploads[index] = newUpload
 	}
 	return listMultipartUploadsResponse
@@ -493,18 +489,18 @@ func writeSuccessNoContent(w http.ResponseWriter) {

 // writeErrorRespone write error headers
 func writeErrorResponse(w http.ResponseWriter, req *http.Request, errorCode APIErrorCode, resource string) {
-	apiError := getAPIError(errorCode)
+	error := getAPIError(errorCode)
 	// set common headers
 	setCommonHeaders(w)
 	// write Header
-	w.WriteHeader(apiError.HTTPStatusCode)
+	w.WriteHeader(error.HTTPStatusCode)
 	writeErrorResponseNoHeader(w, req, errorCode, resource)
 }

 func writeErrorResponseNoHeader(w http.ResponseWriter, req *http.Request, errorCode APIErrorCode, resource string) {
-	apiError := getAPIError(errorCode)
+	error := getAPIError(errorCode)
 	// Generate error response.
-	errorResponse := getAPIErrorResponse(apiError, resource)
+	errorResponse := getAPIErrorResponse(error, resource)
 	encodedErrorResponse := encodeResponse(errorResponse)
 	// HEAD should have no body, do not attempt to write to it
 	if req.Method != "HEAD" {
@@ -20,16 +20,11 @@ import router "github.com/gorilla/mux"

 // objectAPIHandler implements and provides http handlers for S3 API.
 type objectAPIHandlers struct {
-	ObjectAPI func() ObjectLayer
+	ObjectAPI ObjectLayer
 }

 // registerAPIRouter - registers S3 compatible APIs.
-func registerAPIRouter(mux *router.Router) {
-	// Initialize API.
-	api := objectAPIHandlers{
-		ObjectAPI: newObjectLayerFn,
-	}
-
+func registerAPIRouter(mux *router.Router, api objectAPIHandlers) {
 	// API Router
 	apiRouter := mux.NewRoute().PathPrefix("/").Subrouter()

@@ -68,7 +63,7 @@ func registerAPIRouter(mux *router.Router) {
 	// GetBucketNotification
 	bucket.Methods("GET").HandlerFunc(api.GetBucketNotificationHandler).Queries("notification", "")
 	// ListenBucketNotification
-	bucket.Methods("GET").HandlerFunc(api.ListenBucketNotificationHandler).Queries("events", "{events:.*}")
+	bucket.Methods("GET").HandlerFunc(api.ListenBucketNotificationHandler).Queries("notificationARN", "{notificationARN:.*}")
 	// ListMultipartUploads
 	bucket.Methods("GET").HandlerFunc(api.ListMultipartUploadsHandler).Queries("uploads", "")
 	// ListObjectsV2
@@ -18,6 +18,10 @@ package cmd

 import (
 	"bytes"
+	"crypto/md5"
+	"crypto/sha256"
+	"encoding/base64"
+	"encoding/hex"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -38,24 +42,12 @@ func isRequestSignatureV4(r *http.Request) bool {
 	return strings.HasPrefix(r.Header.Get("Authorization"), signV4Algorithm)
 }

-// Verify if request has AWS Signature Version '2'.
-func isRequestSignatureV2(r *http.Request) bool {
-	return (!strings.HasPrefix(r.Header.Get("Authorization"), signV4Algorithm) &&
-		strings.HasPrefix(r.Header.Get("Authorization"), signV2Algorithm))
-}
-
 // Verify if request has AWS PreSign Version '4'.
 func isRequestPresignedSignatureV4(r *http.Request) bool {
 	_, ok := r.URL.Query()["X-Amz-Credential"]
 	return ok
 }

-// Verify request has AWS PreSign Version '2'.
-func isRequestPresignedSignatureV2(r *http.Request) bool {
-	_, ok := r.URL.Query()["AWSAccessKeyId"]
-	return ok
-}
-
 // Verify if request has AWS Post policy Signature Version '4'.
 func isRequestPostPolicySignatureV4(r *http.Request) bool {
 	return strings.Contains(r.Header.Get("Content-Type"), "multipart/form-data") && r.Method == "POST"
@@ -66,6 +58,18 @@ func isRequestSignStreamingV4(r *http.Request) bool {
 	return r.Header.Get("x-amz-content-sha256") == streamingContentSHA256 && r.Method == "PUT"
 }

+// Verify if request has AWS Signature Version '2'.
+func isRequestSignatureV2(r *http.Request) bool {
+	return (!strings.HasPrefix(r.Header.Get("Authorization"), signV4Algorithm) &&
+		strings.HasPrefix(r.Header.Get("Authorization"), signV2Algorithm))
+}
+
+// Verify request has AWS PreSign Version '2'.
+func isRequestPresignedSignatureV2(r *http.Request) bool {
+	_, ok := r.URL.Query()["AWSAccessKeyId"]
+	return ok
+}
+
 // Authorization type.
 type authType int

@@ -104,32 +108,18 @@ func getRequestAuthType(r *http.Request) authType {
 	return authTypeUnknown
 }

-func checkRequestAuthType(r *http.Request, bucket, policyAction, region string) APIErrorCode {
-	reqAuthType := getRequestAuthType(r)
+// sum256 calculate sha256 sum for an input byte array
+func sum256(data []byte) []byte {
+	hash := sha256.New()
+	hash.Write(data)
+	return hash.Sum(nil)
+}

-	switch reqAuthType {
-	case authTypePresignedV2, authTypeSignedV2:
-		// Signature V2 validation.
-		s3Error := isReqAuthenticatedV2(r)
-		if s3Error != ErrNone {
-			errorIf(errSignatureMismatch, dumpRequest(r))
-		}
-		return s3Error
-	case authTypeSigned, authTypePresigned:
-		s3Error := isReqAuthenticated(r, region)
-		if s3Error != ErrNone {
-			errorIf(errSignatureMismatch, dumpRequest(r))
-		}
-		return s3Error
-	}
-
-	if reqAuthType == authTypeAnonymous && policyAction != "" {
-		// http://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html
-		return enforceBucketPolicy(bucket, policyAction, r.URL)
-	}
-
-	// By default return ErrAccessDenied
-	return ErrAccessDenied
+// sumMD5 calculate md5 sum for an input byte array
+func sumMD5(data []byte) []byte {
+	hash := md5.New()
+	hash.Write(data)
+	return hash.Sum(nil)
 }

 // Verify if request has valid AWS Signature Version '2'.
@@ -140,21 +130,6 @@ func isReqAuthenticatedV2(r *http.Request) (s3Error APIErrorCode) {
 	return doesPresignV2SignatureMatch(r)
 }

-func reqSignatureV4Verify(r *http.Request) (s3Error APIErrorCode) {
-	sha256sum := r.Header.Get("X-Amz-Content-Sha256")
-	// Skips calculating sha256 on the payload on server,
-	// if client requested for it.
-	if skipContentSha256Cksum(r) {
-		sha256sum = unsignedPayload
-	}
-	if isRequestSignatureV4(r) {
-		return doesSignatureMatch(sha256sum, r, serverConfig.GetRegion())
-	} else if isRequestPresignedSignatureV4(r) {
-		return doesPresignedSignatureMatch(sha256sum, r, serverConfig.GetRegion())
-	}
-	return ErrAccessDenied
-}
-
 // Verify if request has valid AWS Signature Version '4'.
 func isReqAuthenticated(r *http.Request, region string) (s3Error APIErrorCode) {
 	if r == nil {
@@ -162,23 +137,23 @@ func isReqAuthenticated(r *http.Request, region string) (s3Error APIErrorCode) {
 	}
 	payload, err := ioutil.ReadAll(r.Body)
 	if err != nil {
-		errorIf(err, "Unable to read request body for signature verification")
 		return ErrInternalError
 	}
 	// Verify Content-Md5, if payload is set.
 	if r.Header.Get("Content-Md5") != "" {
-		if r.Header.Get("Content-Md5") != getMD5HashBase64(payload) {
+		if r.Header.Get("Content-Md5") != base64.StdEncoding.EncodeToString(sumMD5(payload)) {
 			return ErrBadDigest
 		}
 	}
 	// Populate back the payload.
 	r.Body = ioutil.NopCloser(bytes.NewReader(payload))
-	// Skips calculating sha256 on the payload on server, if client requested for it.
 	var sha256sum string
+	// Skips calculating sha256 on the payload on server,
+	// if client requested for it.
 	if skipContentSha256Cksum(r) {
 		sha256sum = unsignedPayload
 	} else {
-		sha256sum = getSHA256Hash(payload)
+		sha256sum = hex.EncodeToString(sum256(payload))
 	}
 	if isRequestSignatureV4(r) {
 		return doesSignatureMatch(sha256sum, r, region)
@@ -188,6 +163,30 @@ func isReqAuthenticated(r *http.Request, region string) (s3Error APIErrorCode) {
 	return ErrAccessDenied
 }

+// checkAuth - checks for conditions satisfying the authorization of
+// the incoming request. Request should be either Presigned or Signed
+// in accordance with AWS S3 Signature V4 requirements. ErrAccessDenied
+// is returned for unhandled auth type. Once the auth type is indentified
+// request headers and body are used to calculate the signature validating
+// the client signature present in request.
+func checkAuth(r *http.Request) APIErrorCode {
+	return checkAuthWithRegion(r, serverConfig.GetRegion())
+}
+
+// checkAuthWithRegion - similar to checkAuth but takes a custom region.
+func checkAuthWithRegion(r *http.Request, region string) APIErrorCode {
+	// Validates the request for both Presigned and Signed.
+	aType := getRequestAuthType(r)
+	switch aType {
+	case authTypeSignedV2, authTypePresignedV2: // Signature V2.
+		return isReqAuthenticatedV2(r)
+	case authTypeSigned, authTypePresigned: // Signature V4.
+		return isReqAuthenticated(r, region)
+	}
+	// For all unhandled auth types return error AccessDenied.
+	return ErrAccessDenied
+}
+
 // authHandler - handles all the incoming authorization headers and validates them if possible.
 type authHandler struct {
 	handler http.Handler
@@ -198,7 +198,7 @@ func TestIsRequestUnsignedPayload(t *testing.T) {
 		// Test case - 2.
 		// Test case with "X-Amz-Content-Sha256" header set to  "UNSIGNED-PAYLOAD"
 		// The payload is flagged as unsigned When "X-Amz-Content-Sha256" header is set to  "UNSIGNED-PAYLOAD".
-		{unsignedPayload, true},
+		{"UNSIGNED-PAYLOAD", true},
 		// Test case - 3.
 		// set to a random value.
 		{"abcd", false},
@@ -301,7 +301,7 @@ func mustNewRequest(method string, urlStr string, contentLength int64, body io.R
 func mustNewSignedRequest(method string, urlStr string, contentLength int64, body io.ReadSeeker, t *testing.T) *http.Request {
 	req := mustNewRequest(method, urlStr, contentLength, body, t)
 	cred := serverConfig.GetCredential()
-	if err := signRequestV4(req, cred.AccessKeyID, cred.SecretAccessKey); err != nil {
+	if err := signRequest(req, cred.AccessKeyID, cred.SecretAccessKey); err != nil {
 		t.Fatalf("Unable to inititalized new signed http request %s", err)
 	}
 	return req
@@ -1,206 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"fmt"
-	"net/rpc"
-	"sync"
-	"time"
-
-	jwtgo "github.com/dgrijalva/jwt-go"
-)
-
-// GenericReply represents any generic RPC reply.
-type GenericReply struct{}
-
-// GenericArgs represents any generic RPC arguments.
-type GenericArgs struct {
-	Token string // Used to authenticate every RPC call.
-	// Used to verify if the RPC call was issued between
-	// the same Login() and disconnect event pair.
-	Timestamp time.Time
-
-	// Indicates if args should be sent to remote peers as well.
-	Remote bool
-}
-
-// SetToken - sets the token to the supplied value.
-func (ga *GenericArgs) SetToken(token string) {
-	ga.Token = token
-}
-
-// SetTimestamp - sets the timestamp to the supplied value.
-func (ga *GenericArgs) SetTimestamp(tstamp time.Time) {
-	ga.Timestamp = tstamp
-}
-
-// RPCLoginArgs - login username and password for RPC.
-type RPCLoginArgs struct {
-	Username string
-	Password string
-}
-
-// RPCLoginReply - login reply provides generated token to be used
-// with subsequent requests.
-type RPCLoginReply struct {
-	Token         string
-	Timestamp     time.Time
-	ServerVersion string
-}
-
-// Validates if incoming token is valid.
-func isRPCTokenValid(tokenStr string) bool {
-	jwt, err := newJWT(defaultInterNodeJWTExpiry, serverConfig.GetCredential())
-	if err != nil {
-		errorIf(err, "Unable to initialize JWT")
-		return false
-	}
-	token, err := jwtgo.Parse(tokenStr, func(token *jwtgo.Token) (interface{}, error) {
-		if _, ok := token.Method.(*jwtgo.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
-		}
-		return []byte(jwt.SecretAccessKey), nil
-	})
-	if err != nil {
-		errorIf(err, "Unable to parse JWT token string")
-		return false
-	}
-	// Return if token is valid.
-	return token.Valid
-}
-
-// Auth config represents authentication credentials and Login method name to be used
-// for fetching JWT tokens from the RPC server.
-type authConfig struct {
-	accessKey   string // Username for the server.
-	secretKey   string // Password for the server.
-	secureConn  bool   // Ask for a secured connection
-	address     string // Network address path of RPC server.
-	path        string // Network path for HTTP dial.
-	loginMethod string // RPC service name for authenticating using JWT
-}
-
-// AuthRPCClient is a wrapper type for RPCClient which provides JWT based authentication across reconnects.
-type AuthRPCClient struct {
-	mu            sync.Mutex
-	config        *authConfig
-	rpc           *RPCClient // reconnect'able rpc client built on top of net/rpc Client
-	isLoggedIn    bool       // Indicates if the auth client has been logged in and token is valid.
-	serverToken   string     // Disk rpc JWT based token.
-	serverVersion string     // Server version exchanged by the RPC.
-}
-
-// newAuthClient - returns a jwt based authenticated (go) rpc client, which does automatic reconnect.
-func newAuthClient(cfg *authConfig) *AuthRPCClient {
-	return &AuthRPCClient{
-		// Save the config.
-		config: cfg,
-		// Initialize a new reconnectable rpc client.
-		rpc: newClient(cfg.address, cfg.path, cfg.secureConn),
-		// Allocated auth client not logged in yet.
-		isLoggedIn: false,
-	}
-}
-
-// Close - closes underlying rpc connection.
-func (authClient *AuthRPCClient) Close() error {
-	authClient.mu.Lock()
-	// reset token on closing a connection
-	authClient.isLoggedIn = false
-	authClient.mu.Unlock()
-	return authClient.rpc.Close()
-}
-
-// Login - a jwt based authentication is performed with rpc server.
-func (authClient *AuthRPCClient) Login() (err error) {
-	authClient.mu.Lock()
-	// As soon as the function returns unlock,
-	defer authClient.mu.Unlock()
-
-	// Return if already logged in.
-	if authClient.isLoggedIn {
-		return nil
-	}
-
-	reply := RPCLoginReply{}
-	if err = authClient.rpc.Call(authClient.config.loginMethod, RPCLoginArgs{
-		Username: authClient.config.accessKey,
-		Password: authClient.config.secretKey,
-	}, &reply); err != nil {
-		return err
-	}
-
-	// Validate if version do indeed match.
-	if reply.ServerVersion != Version {
-		return errServerVersionMismatch
-	}
-
-	// Validate if server timestamp is skewed.
-	curTime := time.Now().UTC()
-	if curTime.Sub(reply.Timestamp) > globalMaxSkewTime {
-		return errServerTimeMismatch
-	}
-
-	// Set token, time stamp as received from a successful login call.
-	authClient.serverToken = reply.Token
-	authClient.serverVersion = reply.ServerVersion
-	authClient.isLoggedIn = true
-	return nil
-}
-
-// Call - If rpc connection isn't established yet since previous disconnect,
-// connection is established, a jwt authenticated login is performed and then
-// the call is performed.
-func (authClient *AuthRPCClient) Call(serviceMethod string, args interface {
-	SetToken(token string)
-	SetTimestamp(tstamp time.Time)
-}, reply interface{}) (err error) {
-	// On successful login, attempt the call.
-	if err = authClient.Login(); err == nil {
-		// Set token and timestamp before the rpc call.
-		args.SetToken(authClient.serverToken)
-		args.SetTimestamp(time.Now().UTC())
-
-		// Call the underlying rpc.
-		err = authClient.rpc.Call(serviceMethod, args, reply)
-
-		// Invalidate token, and mark it for re-login on subsequent reconnect.
-		if err != nil && err == rpc.ErrShutdown {
-			authClient.mu.Lock()
-			authClient.isLoggedIn = false
-			authClient.mu.Unlock()
-		}
-	}
-	return err
-}
-
-// Node returns the node (network address) of the connection
-func (authClient *AuthRPCClient) Node() (node string) {
-	if authClient.rpc != nil {
-		node = authClient.rpc.node
-	}
-	return node
-}
-
-// RPCPath returns the RPC path of the connection
-func (authClient *AuthRPCClient) RPCPath() (rpcPath string) {
-	if authClient.rpc != nil {
-		rpcPath = authClient.rpc.rpcPath
-	}
-	return rpcPath
-}
@@ -1,51 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import "testing"
-
-// Tests authorized RPC client.
-func TestAuthRPCClient(t *testing.T) {
-	authCfg := &authConfig{
-		accessKey:   "123",
-		secretKey:   "123",
-		secureConn:  false,
-		address:     "localhost:9000",
-		path:        "/rpc/disk",
-		loginMethod: "MyPackage.LoginHandler",
-	}
-	authRPC := newAuthClient(authCfg)
-	if authRPC.Node() != authCfg.address {
-		t.Fatalf("Unexpected node value %s, but expected %s", authRPC.Node(), authCfg.address)
-	}
-	if authRPC.RPCPath() != authCfg.path {
-		t.Fatalf("Unexpected node value %s, but expected %s", authRPC.RPCPath(), authCfg.path)
-	}
-	authCfg = &authConfig{
-		accessKey:   "123",
-		secretKey:   "123",
-		secureConn:  false,
-		loginMethod: "MyPackage.LoginHandler",
-	}
-	authRPC = newAuthClient(authCfg)
-	if authRPC.Node() != authCfg.address {
-		t.Fatalf("Unexpected node value %s, but expected %s", authRPC.Node(), authCfg.address)
-	}
-	if authRPC.RPCPath() != authCfg.path {
-		t.Fatalf("Unexpected node value %s, but expected %s", authRPC.RPCPath(), authCfg.path)
-	}
-}
@@ -18,46 +18,16 @@ package cmd

 import (
 	"bytes"
+	"crypto/md5"
+	"encoding/hex"
 	"io/ioutil"
 	"math"
 	"math/rand"
 	"strconv"
 	"testing"
 	"time"
-
-	humanize "github.com/dustin/go-humanize"
 )

-// Prepare benchmark backend
-func prepareBenchmarkBackend(instanceType string) (ObjectLayer, []string, error) {
-	var nDisks int
-	switch instanceType {
-	// Total number of disks for FS backend is set to 1.
-	case FSTestStr:
-		nDisks = 1
-		// Total number of disks for FS backend is set to 16.
-	case XLTestStr:
-		nDisks = 16
-	default:
-		nDisks = 1
-	}
-	// get `nDisks` random disks.
-	disks, err := getRandomDisks(nDisks)
-	if err != nil {
-		return nil, nil, err
-	}
-	endpoints, err := parseStorageEndpoints(disks)
-	if err != nil {
-		return nil, nil, err
-	}
-	// initialize object layer.
-	obj, _, err := initObjectLayer(endpoints)
-	if err != nil {
-		return nil, nil, err
-	}
-	return obj, disks, nil
-}
-
 // Benchmark utility functions for ObjectLayer.PutObject().
 // Creates Object layer setup ( MakeBucket ) and then runs the PutObject benchmark.
 func runPutObjectBenchmark(b *testing.B, obj ObjectLayer, objSize int) {
@@ -70,25 +40,29 @@ func runPutObjectBenchmark(b *testing.B, obj ObjectLayer, objSize int) {
 		b.Fatal(err)
 	}

+	// PutObject returns md5Sum of the object inserted.
+	// md5Sum variable is assigned with that value.
+	var md5Sum string
 	// get text data generated for number of bytes equal to object size.
 	textData := generateBytesData(objSize)
 	// generate md5sum for the generated data.
 	// md5sum of the data to written is required as input for PutObject.
+	hasher := md5.New()
+	hasher.Write([]byte(textData))
 	metadata := make(map[string]string)
-	metadata["md5Sum"] = getMD5Hash(textData)
-	sha256sum := ""
+	metadata["md5Sum"] = hex.EncodeToString(hasher.Sum(nil))
 	// benchmark utility which helps obtain number of allocations and bytes allocated per ops.
 	b.ReportAllocs()
 	// the actual benchmark for PutObject starts here. Reset the benchmark timer.
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		// insert the object.
-		objInfo, err := obj.PutObject(bucket, "object"+strconv.Itoa(i), int64(len(textData)), bytes.NewBuffer(textData), metadata, sha256sum)
+		md5Sum, err = obj.PutObject(bucket, "object"+strconv.Itoa(i), int64(len(textData)), bytes.NewBuffer(textData), metadata)
 		if err != nil {
 			b.Fatal(err)
 		}
-		if objInfo.MD5Sum != metadata["md5Sum"] {
-			b.Fatalf("Write no: %d: Md5Sum mismatch during object write into the bucket: Expected %s, got %s", i+1, objInfo.MD5Sum, metadata["md5Sum"])
+		if md5Sum != metadata["md5Sum"] {
+			b.Fatalf("Write no: %d: Md5Sum mismatch during object write into the bucket: Expected %s, got %s", i+1, md5Sum, metadata["md5Sum"])
 		}
 	}
 	// Benchmark ends here. Stop timer.
@@ -109,7 +83,7 @@ func runPutObjectPartBenchmark(b *testing.B, obj ObjectLayer, partSize int) {
 		b.Fatal(err)
 	}

-	objSize := 128 * humanize.MiByte
+	objSize := 128 * 1024 * 1024

 	// PutObjectPart returns md5Sum of the object inserted.
 	// md5Sum variable is assigned with that value.
@@ -118,9 +92,10 @@ func runPutObjectPartBenchmark(b *testing.B, obj ObjectLayer, partSize int) {
 	textData := generateBytesData(objSize)
 	// generate md5sum for the generated data.
 	// md5sum of the data to written is required as input for NewMultipartUpload.
+	hasher := md5.New()
+	hasher.Write([]byte(textData))
 	metadata := make(map[string]string)
-	metadata["md5Sum"] = getMD5Hash(textData)
-	sha256sum := ""
+	metadata["md5Sum"] = hex.EncodeToString(hasher.Sum(nil))
 	uploadID, err = obj.NewMultipartUpload(bucket, object, metadata)
 	if err != nil {
 		b.Fatal(err)
@@ -135,14 +110,16 @@ func runPutObjectPartBenchmark(b *testing.B, obj ObjectLayer, partSize int) {
 		// insert the object.
 		totalPartsNR := int(math.Ceil(float64(objSize) / float64(partSize)))
 		for j := 0; j < totalPartsNR; j++ {
+			hasher.Reset()
 			if j < totalPartsNR-1 {
 				textPartData = textData[j*partSize : (j+1)*partSize-1]
 			} else {
 				textPartData = textData[j*partSize:]
 			}
+			hasher.Write([]byte(textPartData))
 			metadata := make(map[string]string)
-			metadata["md5Sum"] = getMD5Hash([]byte(textPartData))
-			md5Sum, err = obj.PutObjectPart(bucket, object, uploadID, j, int64(len(textPartData)), bytes.NewBuffer(textPartData), metadata["md5Sum"], sha256sum)
+			metadata["md5Sum"] = hex.EncodeToString(hasher.Sum(nil))
+			md5Sum, err = obj.PutObjectPart(bucket, object, uploadID, j, int64(len(textPartData)), bytes.NewBuffer(textPartData), metadata["md5Sum"])
 			if err != nil {
 				b.Fatal(err)
 			}
@@ -157,14 +134,8 @@ func runPutObjectPartBenchmark(b *testing.B, obj ObjectLayer, partSize int) {

 // creates XL/FS backend setup, obtains the object layer and calls the runPutObjectPartBenchmark function.
 func benchmarkPutObjectPart(b *testing.B, instanceType string, objSize int) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		b.Fatalf("Unable to initialize config. %s", err)
-	}
-	defer removeAll(rootPath)
-
 	// create a temp XL/FS backend.
-	objLayer, disks, err := prepareBenchmarkBackend(instanceType)
+	objLayer, disks, err := makeTestBackend(instanceType)
 	if err != nil {
 		b.Fatalf("Failed obtaining Temp Backend: <ERROR> %s", err)
 	}
@@ -176,14 +147,8 @@ func benchmarkPutObjectPart(b *testing.B, instanceType string, objSize int) {

 // creates XL/FS backend setup, obtains the object layer and calls the runPutObjectBenchmark function.
 func benchmarkPutObject(b *testing.B, instanceType string, objSize int) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		b.Fatalf("Unable to initialize config. %s", err)
-	}
-	defer removeAll(rootPath)
-
 	// create a temp XL/FS backend.
-	objLayer, disks, err := prepareBenchmarkBackend(instanceType)
+	objLayer, disks, err := makeTestBackend(instanceType)
 	if err != nil {
 		b.Fatalf("Failed obtaining Temp Backend: <ERROR> %s", err)
 	}
@@ -195,14 +160,8 @@ func benchmarkPutObject(b *testing.B, instanceType string, objSize int) {

 // creates XL/FS backend setup, obtains the object layer and runs parallel benchmark for put object.
 func benchmarkPutObjectParallel(b *testing.B, instanceType string, objSize int) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		b.Fatalf("Unable to initialize config. %s", err)
-	}
-	defer removeAll(rootPath)
-
 	// create a temp XL/FS backend.
-	objLayer, disks, err := prepareBenchmarkBackend(instanceType)
+	objLayer, disks, err := makeTestBackend(instanceType)
 	if err != nil {
 		b.Fatalf("Failed obtaining Temp Backend: <ERROR> %s", err)
 	}
@@ -215,12 +174,7 @@ func benchmarkPutObjectParallel(b *testing.B, instanceType string, objSize int)
 // Benchmark utility functions for ObjectLayer.GetObject().
 // Creates Object layer setup ( MakeBucket, PutObject) and then runs the benchmark.
 func runGetObjectBenchmark(b *testing.B, obj ObjectLayer, objSize int) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		b.Fatalf("Unable to initialize config. %s", err)
-	}
-	defer removeAll(rootPath)
-
+	var err error
 	// obtains random bucket name.
 	bucket := getRandomBucketName()
 	// create bucket.
@@ -229,23 +183,26 @@ func runGetObjectBenchmark(b *testing.B, obj ObjectLayer, objSize int) {
 		b.Fatal(err)
 	}

-	sha256sum := ""
+	// PutObject returns md5Sum of the object inserted.
+	// md5Sum variable is assigned with that value.
+	var md5Sum string
 	for i := 0; i < 10; i++ {
 		// get text data generated for number of bytes equal to object size.
 		textData := generateBytesData(objSize)
 		// generate md5sum for the generated data.
 		// md5sum of the data to written is required as input for PutObject.
 		// PutObject is the functions which writes the data onto the FS/XL backend.
+		hasher := md5.New()
+		hasher.Write([]byte(textData))
 		metadata := make(map[string]string)
-		metadata["md5Sum"] = getMD5Hash(textData)
+		metadata["md5Sum"] = hex.EncodeToString(hasher.Sum(nil))
 		// insert the object.
-		var objInfo ObjectInfo
-		objInfo, err = obj.PutObject(bucket, "object"+strconv.Itoa(i), int64(len(textData)), bytes.NewBuffer(textData), metadata, sha256sum)
+		md5Sum, err = obj.PutObject(bucket, "object"+strconv.Itoa(i), int64(len(textData)), bytes.NewBuffer(textData), metadata)
 		if err != nil {
 			b.Fatal(err)
 		}
-		if objInfo.MD5Sum != metadata["md5Sum"] {
-			b.Fatalf("Write no: %d: Md5Sum mismatch during object write into the bucket: Expected %s, got %s", i+1, objInfo.MD5Sum, metadata["md5Sum"])
+		if md5Sum != metadata["md5Sum"] {
+			b.Fatalf("Write no: %d: Md5Sum mismatch during object write into the bucket: Expected %s, got %s", i+1, md5Sum, metadata["md5Sum"])
 		}
 	}

@@ -269,7 +226,7 @@ func runGetObjectBenchmark(b *testing.B, obj ObjectLayer, objSize int) {
 func getRandomByte() []byte {
 	const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 	// seeding the random number generator.
-	rand.Seed(time.Now().UTC().UnixNano())
+	rand.Seed(time.Now().UnixNano())
 	var b byte
 	// pick a character randomly.
 	b = letterBytes[rand.Intn(len(letterBytes))]
@@ -284,14 +241,8 @@ func generateBytesData(size int) []byte {

 // creates XL/FS backend setup, obtains the object layer and calls the runGetObjectBenchmark function.
 func benchmarkGetObject(b *testing.B, instanceType string, objSize int) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		b.Fatalf("Unable to initialize config. %s", err)
-	}
-	defer removeAll(rootPath)
-
 	// create a temp XL/FS backend.
-	objLayer, disks, err := prepareBenchmarkBackend(instanceType)
+	objLayer, disks, err := makeTestBackend(instanceType)
 	if err != nil {
 		b.Fatalf("Failed obtaining Temp Backend: <ERROR> %s", err)
 	}
@@ -303,14 +254,8 @@ func benchmarkGetObject(b *testing.B, instanceType string, objSize int) {

 // creates XL/FS backend setup, obtains the object layer and runs parallel benchmark for ObjectLayer.GetObject() .
 func benchmarkGetObjectParallel(b *testing.B, instanceType string, objSize int) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		b.Fatalf("Unable to initialize config. %s", err)
-	}
-	defer removeAll(rootPath)
-
 	// create a temp XL/FS backend.
-	objLayer, disks, err := prepareBenchmarkBackend(instanceType)
+	objLayer, disks, err := makeTestBackend(instanceType)
 	if err != nil {
 		b.Fatalf("Failed obtaining Temp Backend: <ERROR> %s", err)
 	}
@@ -323,12 +268,7 @@ func benchmarkGetObjectParallel(b *testing.B, instanceType string, objSize int)
 // Parallel benchmark utility functions for ObjectLayer.PutObject().
 // Creates Object layer setup ( MakeBucket ) and then runs the PutObject benchmark.
 func runPutObjectBenchmarkParallel(b *testing.B, obj ObjectLayer, objSize int) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		b.Fatalf("Unable to initialize config. %s", err)
-	}
-	defer removeAll(rootPath)
-
+	var err error
 	// obtains random bucket name.
 	bucket := getRandomBucketName()
 	// create bucket.
@@ -337,13 +277,17 @@ func runPutObjectBenchmarkParallel(b *testing.B, obj ObjectLayer, objSize int) {
 		b.Fatal(err)
 	}

+	// PutObject returns md5Sum of the object inserted.
+	// md5Sum variable is assigned with that value.
+	var md5Sum string
 	// get text data generated for number of bytes equal to object size.
 	textData := generateBytesData(objSize)
 	// generate md5sum for the generated data.
 	// md5sum of the data to written is required as input for PutObject.
+	hasher := md5.New()
+	hasher.Write([]byte(textData))
 	metadata := make(map[string]string)
-	metadata["md5Sum"] = getMD5Hash([]byte(textData))
-	sha256sum := ""
+	metadata["md5Sum"] = hex.EncodeToString(hasher.Sum(nil))
 	// benchmark utility which helps obtain number of allocations and bytes allocated per ops.
 	b.ReportAllocs()
 	// the actual benchmark for PutObject starts here. Reset the benchmark timer.
@@ -353,12 +297,12 @@ func runPutObjectBenchmarkParallel(b *testing.B, obj ObjectLayer, objSize int) {
 		i := 0
 		for pb.Next() {
 			// insert the object.
-			objInfo, err := obj.PutObject(bucket, "object"+strconv.Itoa(i), int64(len(textData)), bytes.NewBuffer(textData), metadata, sha256sum)
+			md5Sum, err = obj.PutObject(bucket, "object"+strconv.Itoa(i), int64(len(textData)), bytes.NewBuffer(textData), metadata)
 			if err != nil {
 				b.Fatal(err)
 			}
-			if objInfo.MD5Sum != metadata["md5Sum"] {
-				b.Fatalf("Write no: Md5Sum mismatch during object write into the bucket: Expected %s, got %s", objInfo.MD5Sum, metadata["md5Sum"])
+			if md5Sum != metadata["md5Sum"] {
+				b.Fatalf("Write no: Md5Sum mismatch during object write into the bucket: Expected %s, got %s", md5Sum, metadata["md5Sum"])
 			}
 			i++
 		}
@@ -371,12 +315,7 @@ func runPutObjectBenchmarkParallel(b *testing.B, obj ObjectLayer, objSize int) {
 // Parallel benchmark utility functions for ObjectLayer.GetObject().
 // Creates Object layer setup ( MakeBucket, PutObject) and then runs the benchmark.
 func runGetObjectBenchmarkParallel(b *testing.B, obj ObjectLayer, objSize int) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		b.Fatalf("Unable to initialize config. %s", err)
-	}
-	defer removeAll(rootPath)
-
+	var err error
 	// obtains random bucket name.
 	bucket := getRandomBucketName()
 	// create bucket.
@@ -385,23 +324,26 @@ func runGetObjectBenchmarkParallel(b *testing.B, obj ObjectLayer, objSize int) {
 		b.Fatal(err)
 	}

+	// PutObject returns md5Sum of the object inserted.
+	// md5Sum variable is assigned with that value.
+	var md5Sum string
 	for i := 0; i < 10; i++ {
 		// get text data generated for number of bytes equal to object size.
 		textData := generateBytesData(objSize)
 		// generate md5sum for the generated data.
 		// md5sum of the data to written is required as input for PutObject.
 		// PutObject is the functions which writes the data onto the FS/XL backend.
+		hasher := md5.New()
+		hasher.Write([]byte(textData))
 		metadata := make(map[string]string)
-		metadata["md5Sum"] = getMD5Hash([]byte(textData))
-		sha256sum := ""
+		metadata["md5Sum"] = hex.EncodeToString(hasher.Sum(nil))
 		// insert the object.
-		var objInfo ObjectInfo
-		objInfo, err = obj.PutObject(bucket, "object"+strconv.Itoa(i), int64(len(textData)), bytes.NewBuffer(textData), metadata, sha256sum)
+		md5Sum, err = obj.PutObject(bucket, "object"+strconv.Itoa(i), int64(len(textData)), bytes.NewBuffer(textData), metadata)
 		if err != nil {
 			b.Fatal(err)
 		}
-		if objInfo.MD5Sum != metadata["md5Sum"] {
-			b.Fatalf("Write no: %d: Md5Sum mismatch during object write into the bucket: Expected %s, got %s", i+1, objInfo.MD5Sum, metadata["md5Sum"])
+		if md5Sum != metadata["md5Sum"] {
+			b.Fatalf("Write no: %d: Md5Sum mismatch during object write into the bucket: Expected %s, got %s", i+1, md5Sum, metadata["md5Sum"])
 		}
 	}

@@ -1,150 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"path"
-	"sync"
-	"time"
-)
-
-// Login handler implements JWT login token generator, which upon login request
-// along with username and password is generated.
-func (br *browserPeerAPIHandlers) LoginHandler(args *RPCLoginArgs, reply *RPCLoginReply) error {
-	jwt, err := newJWT(defaultInterNodeJWTExpiry, serverConfig.GetCredential())
-	if err != nil {
-		return err
-	}
-	if err = jwt.Authenticate(args.Username, args.Password); err != nil {
-		return err
-	}
-	token, err := jwt.GenerateToken(args.Username)
-	if err != nil {
-		return err
-	}
-	reply.Token = token
-	reply.ServerVersion = Version
-	reply.Timestamp = time.Now().UTC()
-	return nil
-}
-
-// SetAuthPeerArgs - Arguments collection for SetAuth RPC call
-type SetAuthPeerArgs struct {
-	// For Auth
-	GenericArgs
-
-	// New credentials that receiving peer should update to.
-	Creds credential
-}
-
-// SetAuthPeer - Update to new credentials sent from a peer Minio
-// server. Since credentials are already validated on the sending
-// peer, here we just persist to file and update in-memory config. All
-// subsequently running isRPCTokenValid() calls will fail, and clients
-// will be forced to re-establish connections. Connections will be
-// re-established only when the sending client has also updated its
-// credentials.
-func (br *browserPeerAPIHandlers) SetAuthPeer(args SetAuthPeerArgs, reply *GenericReply) error {
-	// Check auth
-	if !isRPCTokenValid(args.Token) {
-		return errInvalidToken
-	}
-
-	// Update credentials in memory
-	serverConfig.SetCredential(args.Creds)
-
-	// Save credentials to config file
-	if err := serverConfig.Save(); err != nil {
-		errorIf(err, "Error updating config file with new credentials sent from browser RPC.")
-		return err
-	}
-
-	return nil
-}
-
-// Sends SetAuthPeer RPCs to all peers in the Minio cluster
-func updateCredsOnPeers(creds credential) map[string]error {
-	// Get list of peer addresses (from globalS3Peers)
-	peers := []string{}
-	for _, p := range globalS3Peers {
-		peers = append(peers, p.addr)
-	}
-
-	// Array of errors for each peer
-	errs := make([]error, len(peers))
-	var wg sync.WaitGroup
-
-	// Launch go routines to send request to each peer in parallel.
-	for ix := range peers {
-		wg.Add(1)
-		go func(ix int) {
-			defer wg.Done()
-
-			// Exclude self to avoid race with
-			// invalidating the RPC token.
-			if peers[ix] == globalMinioAddr {
-				errs[ix] = nil
-				return
-			}
-
-			// Initialize client
-			client := newAuthClient(&authConfig{
-				accessKey:   serverConfig.GetCredential().AccessKeyID,
-				secretKey:   serverConfig.GetCredential().SecretAccessKey,
-				address:     peers[ix],
-				secureConn:  isSSL(),
-				path:        path.Join(reservedBucket, browserPeerPath),
-				loginMethod: "Browser.LoginHandler",
-			})
-
-			// Construct RPC call arguments.
-			args := SetAuthPeerArgs{Creds: creds}
-
-			// Make RPC call - we only care about error
-			// response and not the reply.
-			err := client.Call("Browser.SetAuthPeer", &args, &GenericReply{})
-
-			// We try a bit hard (3 attempts with 1 second delay)
-			// to set creds on peers in case of failure.
-			if err != nil {
-				for i := 0; i < 2; i++ {
-					time.Sleep(1 * time.Second) // 1 second delay.
-					err = client.Call("Browser.SetAuthPeer", &args, &GenericReply{})
-					if err == nil {
-						break
-					}
-				}
-			}
-
-			// Send result down the channel
-			errs[ix] = err
-		}(ix)
-	}
-
-	// Wait for requests to complete.
-	wg.Wait()
-
-	// Put errors into map.
-	errsMap := make(map[string]error)
-	for i, err := range errs {
-		if err != nil {
-			errsMap[peers[i]] = err
-		}
-	}
-
-	return errsMap
-}
@@ -1,123 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"path"
-	"testing"
-)
-
-// API suite container common to both FS and XL.
-type TestRPCBrowserPeerSuite struct {
-	serverType   string
-	testServer   TestServer
-	testAuthConf *authConfig
-}
-
-// Setting up the test suite and starting the Test server.
-func (s *TestRPCBrowserPeerSuite) SetUpSuite(c *testing.T) {
-	s.testServer = StartTestBrowserPeerRPCServer(c, s.serverType)
-	s.testAuthConf = &authConfig{
-		address:     s.testServer.Server.Listener.Addr().String(),
-		accessKey:   s.testServer.AccessKey,
-		secretKey:   s.testServer.SecretKey,
-		path:        path.Join(reservedBucket, browserPeerPath),
-		loginMethod: "BrowserPeer.LoginHandler",
-	}
-}
-
-// No longer used with gocheck, but used in explicit teardown code in
-// each test function. // Called implicitly by "gopkg.in/check.v1"
-// after all tests are run.
-func (s *TestRPCBrowserPeerSuite) TearDownSuite(c *testing.T) {
-	s.testServer.Stop()
-}
-
-func TestBrowserPeerRPC(t *testing.T) {
-	// setup code
-	s := &TestRPCBrowserPeerSuite{serverType: "XL"}
-	s.SetUpSuite(t)
-
-	// run test
-	s.testBrowserPeerRPC(t)
-
-	// teardown code
-	s.TearDownSuite(t)
-}
-
-// Tests for browser peer rpc.
-func (s *TestRPCBrowserPeerSuite) testBrowserPeerRPC(t *testing.T) {
-	// Construct RPC call arguments.
-	creds := credential{
-		AccessKeyID:     "abcd1",
-		SecretAccessKey: "abcd1234",
-	}
-
-	// Validate for invalid token.
-	args := SetAuthPeerArgs{Creds: creds}
-	args.Token = "garbage"
-	rclient := newClient(s.testAuthConf.address, s.testAuthConf.path, false)
-	defer rclient.Close()
-	err := rclient.Call("BrowserPeer.SetAuthPeer", &args, &GenericReply{})
-	if err != nil {
-		if err.Error() != errInvalidToken.Error() {
-			t.Fatal(err)
-		}
-	}
-
-	// Validate for successful Peer update.
-	args = SetAuthPeerArgs{Creds: creds}
-	client := newAuthClient(s.testAuthConf)
-	defer client.Close()
-	err = client.Call("BrowserPeer.SetAuthPeer", &args, &GenericReply{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate for failure in login handler with previous credentials.
-	rclient = newClient(s.testAuthConf.address, s.testAuthConf.path, false)
-	defer rclient.Close()
-	rargs := &RPCLoginArgs{
-		Username: s.testAuthConf.accessKey,
-		Password: s.testAuthConf.secretKey,
-	}
-	rreply := &RPCLoginReply{}
-	err = rclient.Call("BrowserPeer.LoginHandler", rargs, rreply)
-	if err != nil {
-		if err.Error() != errInvalidAccessKeyID.Error() {
-			t.Fatal(err)
-		}
-	}
-
-	// Validate for success in loing handled with valid credetnails.
-	rargs = &RPCLoginArgs{
-		Username: creds.AccessKeyID,
-		Password: creds.SecretAccessKey,
-	}
-	rreply = &RPCLoginReply{}
-	err = rclient.Call("BrowserPeer.LoginHandler", rargs, rreply)
-	if err != nil {
-		t.Fatal(err)
-	}
-	// Validate all the replied fields after successful login.
-	if rreply.Token == "" {
-		t.Fatalf("Generated token cannot be empty %s", errInvalidToken)
-	}
-	if rreply.Timestamp.IsZero() {
-		t.Fatal("Time stamp returned cannot be zero")
-	}
-}
@@ -1,49 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2014-2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"net/rpc"
-
-	router "github.com/gorilla/mux"
-)
-
-// Set up an RPC endpoint that receives browser related calls. The
-// original motivation is for propagating credentials change
-// throughout Minio cluster, initiated from a Minio browser session.
-
-const (
-	browserPeerPath = "/browser/setauth"
-)
-
-// The Type exporting methods exposed for RPC calls.
-type browserPeerAPIHandlers struct{}
-
-// Register RPC router
-func registerBrowserPeerRPCRouter(mux *router.Router) error {
-	bpHandlers := &browserPeerAPIHandlers{}
-
-	bpRPCServer := rpc.NewServer()
-	err := bpRPCServer.RegisterName("BrowserPeer", bpHandlers)
-	if err != nil {
-		return traceError(err)
-	}
-
-	bpRouter := mux.NewRoute().PathPrefix(reservedBucket).Subrouter()
-	bpRouter.Path(browserPeerPath).Handler(bpRPCServer)
-	return nil
-}
@@ -29,7 +29,7 @@ import (
 // - delimiter if set should be equal to '/', otherwise the request is rejected.
 // - marker if set should have a common prefix with 'prefix' param, otherwise
 //   the request is rejected.
-func validateListObjectsArgs(prefix, marker, delimiter string, maxKeys int) APIErrorCode {
+func listObjectsValidateArgs(prefix, marker, delimiter string, maxKeys int) APIErrorCode {
 	// Max keys cannot be negative.
 	if maxKeys < 0 {
 		return ErrInvalidMaxKeys
@@ -64,17 +64,29 @@ func (api objectAPIHandlers) ListObjectsV2Handler(w http.ResponseWriter, r *http
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
+	switch getRequestAuthType(r) {
+	default:
+		// For all unknown auth types return error.
+		writeErrorResponse(w, r, ErrAccessDenied, r.URL.Path)
 		return
+	case authTypeAnonymous:
+		// http://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html
+		if s3Error := enforceBucketPolicy(bucket, "s3:ListBucket", r.URL); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresignedV2, authTypeSignedV2:
+		// Signature V2 validation.
+		if s3Error := isReqAuthenticatedV2(r); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypeSigned, authTypePresigned:
+		if s3Error := isReqAuthenticated(r, serverConfig.GetRegion()); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
 	}
-
-	if s3Error := checkRequestAuthType(r, bucket, "s3:ListBucket", serverConfig.GetRegion()); s3Error != ErrNone {
-		writeErrorResponse(w, r, s3Error, r.URL.Path)
-		return
-	}
-
 	// Extract all the listObjectsV2 query params to their native values.
 	prefix, token, startAfter, delimiter, fetchOwner, maxKeys, _ := getListObjectsV2Args(r.URL.Query())

@@ -87,14 +99,14 @@ func (api objectAPIHandlers) ListObjectsV2Handler(w http.ResponseWriter, r *http
 	}
 	// Validate the query params before beginning to serve the request.
 	// fetch-owner is not validated since it is a boolean
-	if s3Error := validateListObjectsArgs(prefix, marker, delimiter, maxKeys); s3Error != ErrNone {
+	if s3Error := listObjectsValidateArgs(prefix, marker, delimiter, maxKeys); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
 	// Inititate a list objects operation based on the input params.
 	// On success would return back ListObjectsInfo object to be
 	// marshalled into S3 compatible XML header.
-	listObjectsInfo, err := objectAPI.ListObjects(bucket, prefix, marker, delimiter, maxKeys)
+	listObjectsInfo, err := api.ObjectAPI.ListObjects(bucket, prefix, marker, delimiter, maxKeys)
 	if err != nil {
 		errorIf(err, "Unable to list objects.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
@@ -118,22 +130,35 @@ func (api objectAPIHandlers) ListObjectsV1Handler(w http.ResponseWriter, r *http
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, bucket, "s3:ListBucket", serverConfig.GetRegion()); s3Error != ErrNone {
-		writeErrorResponse(w, r, s3Error, r.URL.Path)
+	switch getRequestAuthType(r) {
+	default:
+		// For all unknown auth types return error.
+		writeErrorResponse(w, r, ErrAccessDenied, r.URL.Path)
 		return
+	case authTypeAnonymous:
+		// http://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html
+		if s3Error := enforceBucketPolicy(bucket, "s3:ListBucket", r.URL); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresignedV2, authTypeSignedV2:
+		// Signature V2 validation.
+		if s3Error := isReqAuthenticatedV2(r); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypeSigned, authTypePresigned:
+		if s3Error := isReqAuthenticated(r, serverConfig.GetRegion()); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
 	}

 	// Extract all the litsObjectsV1 query params to their native values.
 	prefix, marker, delimiter, maxKeys, _ := getListObjectsV1Args(r.URL.Query())

 	// Validate all the query params before beginning to serve the request.
-	if s3Error := validateListObjectsArgs(prefix, marker, delimiter, maxKeys); s3Error != ErrNone {
+	if s3Error := listObjectsValidateArgs(prefix, marker, delimiter, maxKeys); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
@@ -141,7 +166,7 @@ func (api objectAPIHandlers) ListObjectsV1Handler(w http.ResponseWriter, r *http
 	// Inititate a list objects operation based on the input params.
 	// On success would return back ListObjectsInfo object to be
 	// marshalled into S3 compatible XML header.
-	listObjectsInfo, err := objectAPI.ListObjects(bucket, prefix, marker, delimiter, maxKeys)
+	listObjectsInfo, err := api.ObjectAPI.ListObjects(bucket, prefix, marker, delimiter, maxKeys)
 	if err != nil {
 		errorIf(err, "Unable to list objects.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
@@ -17,11 +17,11 @@
 package cmd

 import (
-	"encoding/base64"
 	"encoding/xml"
 	"io"
 	"net/http"
 	"net/url"
+	"path"
 	"strings"
 	"sync"

@@ -32,22 +32,9 @@ import (
 // http://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html
 // Enforces bucket policies for a bucket for a given tatusaction.
 func enforceBucketPolicy(bucket string, action string, reqURL *url.URL) (s3Error APIErrorCode) {
-	// Verify if bucket actually exists
-	if err := isBucketExist(bucket, newObjectLayerFn()); err != nil {
-		err = errorCause(err)
-		switch err.(type) {
-		case BucketNameInvalid:
-			// Return error for invalid bucket name.
-			return ErrInvalidBucketName
-		case BucketNotFound:
-			// For no bucket found we return NoSuchBucket instead.
-			return ErrNoSuchBucket
-		}
-		errorIf(err, "Unable to read bucket policy.")
-		// Return internal error for any other errors so that we can investigate.
-		return ErrInternalError
+	if !IsValidBucketName(bucket) {
+		return ErrInvalidBucketName
 	}
-
 	// Fetch bucket policy, if policy is not set return access denied.
 	policy := globalBucketPolicies.GetBucketPolicy(bucket)
 	if policy == nil {
@@ -77,18 +64,31 @@ func (api objectAPIHandlers) GetBucketLocationHandler(w http.ResponseWriter, r *
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
+	switch getRequestAuthType(r) {
+	default:
+		// For all unknown auth types return error.
+		writeErrorResponse(w, r, ErrAccessDenied, r.URL.Path)
 		return
+	case authTypeAnonymous:
+		// http://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html
+		if s3Error := enforceBucketPolicy(bucket, "s3:GetBucketLocation", r.URL); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresignedV2, authTypeSignedV2:
+		// Signature V2 validation.
+		if s3Error := isReqAuthenticatedV2(r); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypeSigned, authTypePresigned:
+		if s3Error := isReqAuthenticated(r, "us-east-1"); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
 	}

-	if s3Error := checkRequestAuthType(r, bucket, "s3:GetBucketLocation", "us-east-1"); s3Error != ErrNone {
-		writeErrorResponse(w, r, s3Error, r.URL.Path)
-		return
-	}
-
-	if _, err := objectAPI.GetBucketInfo(bucket); err != nil {
+	if _, err := api.ObjectAPI.GetBucketInfo(bucket); err != nil {
 		errorIf(err, "Unable to fetch bucket info.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
 		return
@@ -119,15 +119,28 @@ func (api objectAPIHandlers) ListMultipartUploadsHandler(w http.ResponseWriter,
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, bucket, "s3:ListBucketMultipartUploads", serverConfig.GetRegion()); s3Error != ErrNone {
-		writeErrorResponse(w, r, s3Error, r.URL.Path)
+	switch getRequestAuthType(r) {
+	default:
+		// For all unknown auth types return error.
+		writeErrorResponse(w, r, ErrAccessDenied, r.URL.Path)
 		return
+	case authTypeAnonymous:
+		// http://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html
+		if s3Error := enforceBucketPolicy(bucket, "s3:ListBucketMultipartUploads", r.URL); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresignedV2, authTypeSignedV2:
+		// Signature V2 validation.
+		if s3Error := isReqAuthenticatedV2(r); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresigned, authTypeSigned:
+		if s3Error := isReqAuthenticated(r, serverConfig.GetRegion()); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
 	}

 	prefix, keyMarker, uploadIDMarker, delimiter, maxUploads, _ := getBucketMultipartResources(r.URL.Query())
@@ -143,7 +156,7 @@ func (api objectAPIHandlers) ListMultipartUploadsHandler(w http.ResponseWriter,
 		}
 	}

-	listMultipartsInfo, err := objectAPI.ListMultipartUploads(bucket, prefix, keyMarker, uploadIDMarker, delimiter, maxUploads)
+	listMultipartsInfo, err := api.ObjectAPI.ListMultipartUploads(bucket, prefix, keyMarker, uploadIDMarker, delimiter, maxUploads)
 	if err != nil {
 		errorIf(err, "Unable to list multipart uploads.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
@@ -158,25 +171,19 @@ func (api objectAPIHandlers) ListMultipartUploadsHandler(w http.ResponseWriter,
 	writeSuccessResponse(w, encodedSuccessResponse)
 }

-// ListBucketsHandler - GET Service.
+// ListBucketsHandler - GET Service
 // -----------
 // This implementation of the GET operation returns a list of all buckets
 // owned by the authenticated sender of the request.
 func (api objectAPIHandlers) ListBucketsHandler(w http.ResponseWriter, r *http.Request) {
-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	// ListBuckets does not have any bucket action.
-	if s3Error := checkRequestAuthType(r, "", "", "us-east-1"); s3Error != ErrNone {
+	// List buckets does not support bucket policies, no need to enforce it.
+	// Proceed to validate signature. Validates the request for both Presigned and Signed.
+	if s3Error := checkAuthWithRegion(r, ""); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}

-	// Invoke the list buckets.
-	bucketsInfo, err := objectAPI.ListBuckets()
+	bucketsInfo, err := api.ObjectAPI.ListBuckets()
 	if err != nil {
 		errorIf(err, "Unable to list buckets.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
@@ -197,15 +204,28 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter,
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, bucket, "s3:DeleteObject", serverConfig.GetRegion()); s3Error != ErrNone {
-		writeErrorResponse(w, r, s3Error, r.URL.Path)
+	switch getRequestAuthType(r) {
+	default:
+		// For all unknown auth types return error.
+		writeErrorResponse(w, r, ErrAccessDenied, r.URL.Path)
 		return
+	case authTypeAnonymous:
+		// http://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html
+		if s3Error := enforceBucketPolicy(bucket, "s3:DeleteObject", r.URL); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresignedV2, authTypeSignedV2:
+		// Signature V2 validation.
+		if s3Error := isReqAuthenticatedV2(r); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresigned, authTypeSigned:
+		if s3Error := isReqAuthenticated(r, serverConfig.GetRegion()); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
 	}

 	// Content-Length is required and should be non-zero
@@ -248,7 +268,7 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter,
 		wg.Add(1)
 		go func(i int, obj ObjectIdentifier) {
 			defer wg.Done()
-			dErr := objectAPI.DeleteObject(bucket, obj.ObjectName)
+			dErr := api.ObjectAPI.DeleteObject(bucket, obj.ObjectName)
 			if dErr != nil {
 				dErrs[i] = dErr
 			}
@@ -266,7 +286,7 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter,
 			deletedObjects = append(deletedObjects, object)
 			continue
 		}
-		if _, ok := errorCause(err).(ObjectNotFound); ok {
+		if _, ok := err.(ObjectNotFound); ok {
 			// If the object is not found it should be
 			// accounted as deleted as per S3 spec.
 			deletedObjects = append(deletedObjects, object)
@@ -289,18 +309,20 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter,
 	// Write success response.
 	writeSuccessResponse(w, encodedSuccessResponse)

-	// Notify deleted event for objects.
-	for _, dobj := range deletedObjects {
-		eventNotify(eventData{
-			Type:   ObjectRemovedDelete,
-			Bucket: bucket,
-			ObjInfo: ObjectInfo{
-				Name: dobj.ObjectName,
-			},
-			ReqParams: map[string]string{
-				"sourceIPAddress": r.RemoteAddr,
-			},
-		})
+	if globalEventNotifier.IsBucketNotificationSet(bucket) {
+		// Notify deleted event for objects.
+		for _, dobj := range deletedObjects {
+			eventNotify(eventData{
+				Type:   ObjectRemovedDelete,
+				Bucket: bucket,
+				ObjInfo: ObjectInfo{
+					Name: dobj.ObjectName,
+				},
+				ReqParams: map[string]string{
+					"sourceIPAddress": r.RemoteAddr,
+				},
+			})
+		}
 	}
 }

@@ -308,14 +330,8 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter,
 // ----------
 // This implementation of the PUT operation creates a new bucket for authenticated request
 func (api objectAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Request) {
-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	// PutBucket does not have any bucket action.
-	if s3Error := checkRequestAuthType(r, "", "", "us-east-1"); s3Error != ErrNone {
+	// PutBucket does not support policies, use checkAuth to validate signature.
+	if s3Error := checkAuthWithRegion(r, "us-east-1"); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
@@ -331,7 +347,7 @@ func (api objectAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Req
 	}

 	// Proceed to creating a bucket.
-	err := objectAPI.MakeBucket(bucket)
+	err := api.ObjectAPI.MakeBucket(bucket)
 	if err != nil {
 		errorIf(err, "Unable to create a bucket.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
@@ -347,12 +363,6 @@ func (api objectAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Req
 // This implementation of the POST operation handles object creation with a specified
 // signature policy in multipart/form-data
 func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *http.Request) {
-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
 	// Here the parameter is the size of the form data that should
 	// be loaded in memory, the remaining being put in temporary files.
 	reader, err := r.MultipartReader()
@@ -384,56 +394,26 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h
 		writeErrorResponse(w, r, apiErr, r.URL.Path)
 		return
 	}
-
-	policyBytes, err := base64.StdEncoding.DecodeString(formValues["Policy"])
-	if err != nil {
-		writeErrorResponse(w, r, ErrMalformedPOSTRequest, r.URL.Path)
-		return
-	}
-
-	postPolicyForm, err := parsePostPolicyForm(string(policyBytes))
-	if err != nil {
-		writeErrorResponse(w, r, ErrMalformedPOSTRequest, r.URL.Path)
-		return
-	}
-
-	// Make sure formValues adhere to policy restrictions.
-	if apiErr = checkPostPolicy(formValues, postPolicyForm); apiErr != ErrNone {
+	if apiErr = checkPostPolicy(formValues); apiErr != ErrNone {
 		writeErrorResponse(w, r, apiErr, r.URL.Path)
 		return
 	}

-	// Use rangeReader to ensure that object size is within expected range.
-	lengthRange := postPolicyForm.Conditions.ContentLengthRange
-	if lengthRange.Valid {
-		// If policy restricted the size of the object.
-		fileBody = &rangeReader{
-			Reader: fileBody,
-			Min:    lengthRange.Min,
-			Max:    lengthRange.Max,
-		}
-	} else {
-		// Default values of min/max size of the object.
-		fileBody = &rangeReader{
-			Reader: fileBody,
-			Min:    0,
-			Max:    maxObjectSize,
-		}
-	}
-
 	// Save metadata.
 	metadata := make(map[string]string)
 	// Nothing to store right now.

-	sha256sum := ""
-
-	objInfo, err := objectAPI.PutObject(bucket, object, -1, fileBody, metadata, sha256sum)
+	md5Sum, err := api.ObjectAPI.PutObject(bucket, object, -1, fileBody, metadata)
 	if err != nil {
 		errorIf(err, "Unable to create object.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
 		return
 	}
-	w.Header().Set("ETag", "\""+objInfo.MD5Sum+"\"")
+	if md5Sum != "" {
+		w.Header().Set("ETag", "\""+md5Sum+"\"")
+	}
+
+	// TODO full URL is preferred.
 	w.Header().Set("Location", getObjectLocation(bucket, object))

 	// Set common headers.
@@ -442,15 +422,24 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h
 	// Write successful response.
 	writeSuccessNoContent(w)

-	// Notify object created event.
-	eventNotify(eventData{
-		Type:    ObjectCreatedPost,
-		Bucket:  bucket,
-		ObjInfo: objInfo,
-		ReqParams: map[string]string{
-			"sourceIPAddress": r.RemoteAddr,
-		},
-	})
+	if globalEventNotifier.IsBucketNotificationSet(bucket) {
+		// Fetch object info for notifications.
+		objInfo, err := api.ObjectAPI.GetObjectInfo(bucket, object)
+		if err != nil {
+			errorIf(err, "Unable to fetch object info for \"%s\"", path.Join(bucket, object))
+			return
+		}
+
+		// Notify object created event.
+		eventNotify(eventData{
+			Type:    ObjectCreatedPost,
+			Bucket:  bucket,
+			ObjInfo: objInfo,
+			ReqParams: map[string]string{
+				"sourceIPAddress": r.RemoteAddr,
+			},
+		})
+	}
 }

 // HeadBucketHandler - HEAD Bucket
@@ -463,18 +452,31 @@ func (api objectAPIHandlers) HeadBucketHandler(w http.ResponseWriter, r *http.Re
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
+	switch getRequestAuthType(r) {
+	default:
+		// For all unknown auth types return error.
+		writeErrorResponse(w, r, ErrAccessDenied, r.URL.Path)
 		return
+	case authTypeAnonymous:
+		// http://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html
+		if s3Error := enforceBucketPolicy(bucket, "s3:ListBucket", r.URL); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresignedV2, authTypeSignedV2:
+		// Signature V2 validation.
+		if s3Error := isReqAuthenticatedV2(r); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
+	case authTypePresigned, authTypeSigned:
+		if s3Error := isReqAuthenticated(r, serverConfig.GetRegion()); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
 	}

-	if s3Error := checkRequestAuthType(r, bucket, "s3:ListBucket", serverConfig.GetRegion()); s3Error != ErrNone {
-		writeErrorResponse(w, r, s3Error, r.URL.Path)
-		return
-	}
-
-	if _, err := objectAPI.GetBucketInfo(bucket); err != nil {
+	if _, err := api.ObjectAPI.GetBucketInfo(bucket); err != nil {
 		errorIf(err, "Unable to fetch bucket info.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
 		return
@@ -484,14 +486,8 @@ func (api objectAPIHandlers) HeadBucketHandler(w http.ResponseWriter, r *http.Re

 // DeleteBucketHandler - Delete bucket
 func (api objectAPIHandlers) DeleteBucketHandler(w http.ResponseWriter, r *http.Request) {
-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	// DeleteBucket does not have any bucket action.
-	if s3Error := checkRequestAuthType(r, "", "", serverConfig.GetRegion()); s3Error != ErrNone {
+	// DeleteBucket does not support bucket policies, use checkAuth to validate signature.
+	if s3Error := checkAuth(r); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
@@ -500,20 +496,17 @@ func (api objectAPIHandlers) DeleteBucketHandler(w http.ResponseWriter, r *http.
 	bucket := vars["bucket"]

 	// Attempt to delete bucket.
-	if err := objectAPI.DeleteBucket(bucket); err != nil {
+	if err := api.ObjectAPI.DeleteBucket(bucket); err != nil {
 		errorIf(err, "Unable to delete a bucket.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
 		return
 	}

 	// Delete bucket access policy, if present - ignore any errors.
-	_ = removeBucketPolicy(bucket, objectAPI)
+	removeBucketPolicy(bucket, api.ObjectAPI)

 	// Delete notification config, if present - ignore any errors.
-	_ = removeNotificationConfig(bucket, objectAPI)
-
-	// Delete listener config, if present - ignore any errors.
-	_ = removeListenerConfig(bucket, objectAPI)
+	removeNotificationConfig(bucket, api.ObjectAPI)

 	// Write success response.
 	writeSuccessNoContent(w)
@@ -1,773 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"bytes"
-	"encoding/xml"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"strconv"
-	"testing"
-)
-
-// Wrapper for calling GetBucketPolicy HTTP handler tests for both XL multiple disks and single node setup.
-func TestGetBucketLocationHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testGetBucketLocationHandler, []string{"GetBucketLocation"})
-}
-
-func testGetBucketLocationHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	initBucketPolicies(obj)
-
-	// test cases with sample input and expected output.
-	testCases := []struct {
-		bucketName string
-		accessKey  string
-		secretKey  string
-		// expected Response.
-		expectedRespStatus int
-		locationResponse   []byte
-		errorResponse      APIErrorResponse
-		shouldPass         bool
-	}{
-		// Test case - 1.
-		// Tests for authenticated request and proper response.
-		{
-			bucketName:         bucketName,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusOK,
-			locationResponse: []byte(`<?xml version="1.0" encoding="UTF-8"?>
-<LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/"></LocationConstraint>`),
-			errorResponse: APIErrorResponse{},
-			shouldPass:    true,
-		},
-		// Test case - 2.
-		// Tests for signature mismatch error.
-		{
-			bucketName:         bucketName,
-			accessKey:          "abcd",
-			secretKey:          "abcd",
-			expectedRespStatus: http.StatusForbidden,
-			locationResponse:   []byte(""),
-			errorResponse: APIErrorResponse{
-				Resource: "/" + bucketName + "/",
-				Code:     "InvalidAccessKeyID",
-				Message:  "The access key ID you provided does not exist in our records.",
-			},
-			shouldPass: false,
-		},
-	}
-
-	for i, testCase := range testCases {
-		if i != 1 {
-			continue
-		}
-		// initialize httptest Recorder, this records any mutations to response writer inside the handler.
-		rec := httptest.NewRecorder()
-		// construct HTTP request for Get bucket location.
-		req, err := newTestSignedRequestV4("GET", getBucketLocationURL("", testCase.bucketName), 0, nil, testCase.accessKey, testCase.secretKey)
-		if err != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for GetBucketLocationHandler: <ERROR> %v", i+1, instanceType, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(rec, req)
-		if rec.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, rec.Code)
-		}
-		if !bytes.Equal(testCase.locationResponse, rec.Body.Bytes()) && testCase.shouldPass {
-			t.Errorf("Test %d: %s: Expected the response to be `%s`, but instead found `%s`", i+1, instanceType, string(testCase.locationResponse), string(rec.Body.Bytes()))
-		}
-		errorResponse := APIErrorResponse{}
-		err = xml.Unmarshal(rec.Body.Bytes(), &errorResponse)
-		if err != nil && !testCase.shouldPass {
-			t.Fatalf("Test %d: %s: Unable to marshal response body %s", i+1, instanceType, string(rec.Body.Bytes()))
-		}
-		if errorResponse.Resource != testCase.errorResponse.Resource {
-			t.Errorf("Test %d: %s: Expected the error resource to be `%s`, but instead found `%s`", i+1, instanceType, testCase.errorResponse.Resource, errorResponse.Resource)
-		}
-		if errorResponse.Message != testCase.errorResponse.Message {
-			t.Errorf("Test %d: %s: Expected the error message to be `%s`, but instead found `%s`", i+1, instanceType, testCase.errorResponse.Message, errorResponse.Message)
-		}
-		if errorResponse.Code != testCase.errorResponse.Code {
-			t.Errorf("Test %d: %s: Expected the error code to be `%s`, but instead found `%s`", i+1, instanceType, testCase.errorResponse.Code, errorResponse.Code)
-		}
-
-		// Verify response of the V2 signed HTTP request.
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for PUT bucket policy endpoint.
-		reqV2, err := newTestSignedRequestV2("GET", getBucketLocationURL("", testCase.bucketName), 0, nil, testCase.accessKey, testCase.secretKey)
-
-		if err != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, instanceType, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		if recV2.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, recV2.Code)
-		}
-
-		errorResponse = APIErrorResponse{}
-		err = xml.Unmarshal(recV2.Body.Bytes(), &errorResponse)
-		if err != nil && !testCase.shouldPass {
-			t.Fatalf("Test %d: %s: Unable to marshal response body %s", i+1, instanceType, string(recV2.Body.Bytes()))
-		}
-		if errorResponse.Resource != testCase.errorResponse.Resource {
-			t.Errorf("Test %d: %s: Expected the error resource to be `%s`, but instead found `%s`", i+1, instanceType, testCase.errorResponse.Resource, errorResponse.Resource)
-		}
-		if errorResponse.Message != testCase.errorResponse.Message {
-			t.Errorf("Test %d: %s: Expected the error message to be `%s`, but instead found `%s`", i+1, instanceType, testCase.errorResponse.Message, errorResponse.Message)
-		}
-		if errorResponse.Code != testCase.errorResponse.Code {
-			t.Errorf("Test %d: %s: Expected the error code to be `%s`, but instead found `%s`", i+1, instanceType, testCase.errorResponse.Code, errorResponse.Code)
-		}
-
-	}
-
-	// Test for Anonymous/unsigned http request.
-	// ListBucketsHandler doesn't support bucket policies, setting the policies shouldn't make any difference.
-	anonReq, err := newTestRequest("GET", getBucketLocationURL("", bucketName), 0, nil)
-	if err != nil {
-		t.Fatalf("Minio %s: Failed to create an anonymous request.", instanceType)
-	}
-
-	// ExecObjectLayerAPIAnonTest - Calls the HTTP API handler using the anonymous request, validates the ErrAccessDeniedResponse,
-	// sets the bucket policy using the policy statement generated from `getReadOnlyBucketStatement` so that the
-	// unsigned request goes through and its validated again.
-	ExecObjectLayerAPIAnonTest(t, "TestGetBucketLocationHandler", bucketName, "", instanceType, apiRouter, anonReq, getReadOnlyBucketStatement)
-
-	// HTTP request for testing when `objectLayer` is set to `nil`.
-	// There is no need to use an existing bucket and valid input for creating the request
-	// since the `objectLayer==nil`  check is performed before any other checks inside the handlers.
-	// The only aim is to generate an HTTP request in a way that the relevant/registered end point is evoked/called.
-
-	nilBucket := "dummy-bucket"
-	nilReq, err := newTestRequest("GET", getBucketLocationURL("", nilBucket), 0, nil)
-
-	if err != nil {
-		t.Errorf("Minio %s: Failed to create HTTP request for testing the response when object Layer is set to `nil`.", instanceType)
-	}
-	// Executes the object layer set to `nil` test.
-	// `ExecObjectLayerAPINilTest` manages the operation.
-	ExecObjectLayerAPINilTest(t, nilBucket, "", instanceType, apiRouter, nilReq)
-}
-
-// Wrapper for calling HeadBucket HTTP handler tests for both XL multiple disks and single node setup.
-func TestHeadBucketHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testHeadBucketHandler, []string{"HeadBucket"})
-}
-
-func testHeadBucketHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	initBucketPolicies(obj)
-
-	// test cases with sample input and expected output.
-	testCases := []struct {
-		bucketName string
-		accessKey  string
-		secretKey  string
-		// expected Response.
-		expectedRespStatus int
-	}{
-		// Test case - 1.
-		// Bucket exists.
-		{
-			bucketName:         bucketName,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusOK,
-		},
-		// Test case - 2.
-		// Non-existent bucket name.
-		{
-			bucketName:         "2333",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNotFound,
-		},
-		// Test case - 3.
-		// Testing for signature mismatch error.
-		// setting invalid acess and secret key.
-		{
-			bucketName:         bucketName,
-			accessKey:          "abcd",
-			secretKey:          "abcd",
-			expectedRespStatus: http.StatusForbidden,
-		},
-	}
-
-	for i, testCase := range testCases {
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		rec := httptest.NewRecorder()
-		// construct HTTP request for HEAD bucket.
-		req, err := newTestSignedRequestV4("HEAD", getHEADBucketURL("", testCase.bucketName), 0, nil, testCase.accessKey, testCase.secretKey)
-		if err != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for HeadBucketHandler: <ERROR> %v", i+1, instanceType, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(rec, req)
-		if rec.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, rec.Code)
-		}
-
-		// Verify response the V2 signed HTTP request.
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for PUT bucket policy endpoint.
-		reqV2, err := newTestSignedRequestV2("HEAD", getHEADBucketURL("", testCase.bucketName), 0, nil, testCase.accessKey, testCase.secretKey)
-
-		if err != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, instanceType, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		if recV2.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, recV2.Code)
-		}
-
-	}
-
-	// Test for Anonymous/unsigned http request.
-	anonReq, err := newTestRequest("HEAD", getHEADBucketURL("", bucketName), 0, nil)
-
-	if err != nil {
-		t.Fatalf("Minio %s: Failed to create an anonymous request for bucket \"%s\": <ERROR> %v",
-			instanceType, bucketName, err)
-	}
-
-	// ExecObjectLayerAPIAnonTest - Calls the HTTP API handler using the anonymous request, validates the ErrAccessDeniedResponse,
-	// sets the bucket policy using the policy statement generated from `getReadOnlyBucketStatement` so that the
-	// unsigned request goes through and its validated again.
-	ExecObjectLayerAPIAnonTest(t, "TestHeadBucketHandler", bucketName, "", instanceType, apiRouter, anonReq, getReadOnlyBucketStatement)
-
-	// HTTP request for testing when `objectLayer` is set to `nil`.
-	// There is no need to use an existing bucket and valid input for creating the request
-	// since the `objectLayer==nil`  check is performed before any other checks inside the handlers.
-	// The only aim is to generate an HTTP request in a way that the relevant/registered end point is evoked/called.
-
-	nilBucket := "dummy-bucket"
-	nilReq, err := newTestRequest("HEAD", getHEADBucketURL("", nilBucket), 0, nil)
-
-	if err != nil {
-		t.Errorf("Minio %s: Failed to create HTTP request for testing the response when object Layer is set to `nil`.", instanceType)
-	}
-	// execute the object layer set to `nil` test.
-	// `ExecObjectLayerAPINilTest` manages the operation.
-	ExecObjectLayerAPINilTest(t, nilBucket, "", instanceType, apiRouter, nilReq)
-}
-
-// Wrapper for calling TestListMultipartUploadsHandler tests for both XL multiple disks and single node setup.
-func TestListMultipartUploadsHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testListMultipartUploadsHandler, []string{"ListMultipartUploads"})
-}
-
-// testListMultipartUploadsHandler - Tests validate listing of multipart uploads.
-func testListMultipartUploadsHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	initBucketPolicies(obj)
-
-	// Collection of non-exhaustive ListMultipartUploads test cases, valid errors
-	// and success responses.
-	testCases := []struct {
-		// Inputs to ListMultipartUploads.
-		bucket             string
-		prefix             string
-		keyMarker          string
-		uploadIDMarker     string
-		delimiter          string
-		maxUploads         string
-		accessKey          string
-		secretKey          string
-		expectedRespStatus int
-		shouldPass         bool
-	}{
-		// Test case - 1.
-		// Setting invalid bucket name.
-		{
-			bucket:             ".test",
-			prefix:             "",
-			keyMarker:          "",
-			uploadIDMarker:     "",
-			delimiter:          "",
-			maxUploads:         "0",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusBadRequest,
-			shouldPass:         false,
-		},
-		// Test case - 2.
-		// Setting a non-existent bucket.
-		{
-			bucket:             "volatile-bucket-1",
-			prefix:             "",
-			keyMarker:          "",
-			uploadIDMarker:     "",
-			delimiter:          "",
-			maxUploads:         "0",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNotFound,
-			shouldPass:         false,
-		},
-		// Test case -3.
-		// Setting invalid delimiter, expecting the HTTP response status to be http.StatusNotImplemented.
-		{
-			bucket:             bucketName,
-			prefix:             "",
-			keyMarker:          "",
-			uploadIDMarker:     "",
-			delimiter:          "-",
-			maxUploads:         "0",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNotImplemented,
-			shouldPass:         false,
-		},
-		// Test case - 4.
-		// Setting Invalid prefix and marker combination.
-		{
-			bucket:             bucketName,
-			prefix:             "asia",
-			keyMarker:          "europe-object",
-			uploadIDMarker:     "",
-			delimiter:          "",
-			maxUploads:         "0",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNotImplemented,
-			shouldPass:         false,
-		},
-		// Test case - 5.
-		// Invalid upload id and marker combination.
-		{
-			bucket:             bucketName,
-			prefix:             "asia",
-			keyMarker:          "asia/europe/",
-			uploadIDMarker:     "abc",
-			delimiter:          "",
-			maxUploads:         "0",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNotImplemented,
-			shouldPass:         false,
-		},
-		// Test case - 6.
-		// Setting a negative value to max-uploads paramater, should result in http.StatusBadRequest.
-		{
-			bucket:             bucketName,
-			prefix:             "",
-			keyMarker:          "",
-			uploadIDMarker:     "",
-			delimiter:          "",
-			maxUploads:         "-1",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusBadRequest,
-			shouldPass:         false,
-		},
-		// Test case - 7.
-		// Case with right set of parameters,
-		// should result in success 200OK.
-		{
-			bucket:             bucketName,
-			prefix:             "",
-			keyMarker:          "",
-			uploadIDMarker:     "",
-			delimiter:          "/",
-			maxUploads:         "100",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusOK,
-			shouldPass:         true,
-		},
-		// Test case - 8.
-		// Good case without delimiter.
-		{
-			bucket:             bucketName,
-			prefix:             "",
-			keyMarker:          "",
-			uploadIDMarker:     "",
-			delimiter:          "",
-			maxUploads:         "100",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusOK,
-			shouldPass:         true,
-		},
-		// Test case - 9.
-		// Setting Invalid AccessKey and SecretKey to induce and verify Signature Mismatch error.
-		{
-			bucket:             bucketName,
-			prefix:             "",
-			keyMarker:          "",
-			uploadIDMarker:     "",
-			delimiter:          "",
-			maxUploads:         "100",
-			accessKey:          "abcd",
-			secretKey:          "abcd",
-			expectedRespStatus: http.StatusForbidden,
-			shouldPass:         true,
-		},
-	}
-
-	for i, testCase := range testCases {
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		rec := httptest.NewRecorder()
-
-		// construct HTTP request for List multipart uploads endpoint.
-		u := getListMultipartUploadsURLWithParams("", testCase.bucket, testCase.prefix, testCase.keyMarker, testCase.uploadIDMarker, testCase.delimiter, testCase.maxUploads)
-		req, gerr := newTestSignedRequestV4("GET", u, 0, nil, testCase.accessKey, testCase.secretKey)
-		if gerr != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for ListMultipartUploadsHandler: <ERROR> %v", i+1, instanceType, gerr)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(rec, req)
-		if rec.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, rec.Code)
-		}
-
-		// Verify response the V2 signed HTTP request.
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for PUT bucket policy endpoint.
-
-		// verify response for V2 signed HTTP request.
-		reqV2, err := newTestSignedRequestV2("GET", u, 0, nil, testCase.accessKey, testCase.secretKey)
-
-		if err != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, instanceType, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		if recV2.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, recV2.Code)
-		}
-	}
-
-	// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-	rec := httptest.NewRecorder()
-
-	// construct HTTP request for List multipart uploads endpoint.
-	u := getListMultipartUploadsURLWithParams("", bucketName, "", "", "", "", "")
-	req, err := newTestSignedRequestV4("GET", u, 0, nil, "", "") // Generate an anonymous request.
-	if err != nil {
-		t.Fatalf("Test %s: Failed to create HTTP request for ListMultipartUploadsHandler: <ERROR> %v", instanceType, err)
-	}
-	// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-	// Call the ServeHTTP to execute the handler.
-	apiRouter.ServeHTTP(rec, req)
-	if rec.Code != http.StatusForbidden {
-		t.Errorf("Test %s: Expected the response status to be `http.StatusForbidden`, but instead found `%d`", instanceType, rec.Code)
-	}
-
-	url := getListMultipartUploadsURLWithParams("", testCases[6].bucket, testCases[6].prefix, testCases[6].keyMarker,
-		testCases[6].uploadIDMarker, testCases[6].delimiter, testCases[6].maxUploads)
-	// Test for Anonymous/unsigned http request.
-	anonReq, err := newTestRequest("GET", url, 0, nil)
-	if err != nil {
-		t.Fatalf("Minio %s: Failed to create an anonymous request for bucket \"%s\": <ERROR> %v",
-			instanceType, bucketName, err)
-	}
-
-	// ExecObjectLayerAPIAnonTest - Calls the HTTP API handler using the anonymous request, validates the ErrAccessDeniedResponse,
-	// sets the bucket policy using the policy statement generated from `getWriteOnlyBucketStatement` so that the
-	// unsigned request goes through and its validated again.
-	ExecObjectLayerAPIAnonTest(t, "TestListMultipartUploadsHandler", bucketName, "", instanceType, apiRouter, anonReq, getWriteOnlyBucketStatement)
-
-	// HTTP request for testing when `objectLayer` is set to `nil`.
-	// There is no need to use an existing bucket and valid input for creating the request
-	// since the `objectLayer==nil`  check is performed before any other checks inside the handlers.
-	// The only aim is to generate an HTTP request in a way that the relevant/registered end point is evoked/called.
-
-	nilBucket := "dummy-bucket"
-	url = getListMultipartUploadsURLWithParams("", nilBucket, "dummy-prefix", testCases[6].keyMarker,
-		testCases[6].uploadIDMarker, testCases[6].delimiter, testCases[6].maxUploads)
-
-	nilReq, err := newTestRequest("GET", url, 0, nil)
-
-	if err != nil {
-		t.Errorf("Minio %s: Failed to create HTTP request for testing the response when object Layer is set to `nil`.", instanceType)
-	}
-	// execute the object layer set to `nil` test.
-	// `ExecObjectLayerAPINilTest` manages the operation.
-	ExecObjectLayerAPINilTest(t, nilBucket, "", instanceType, apiRouter, nilReq)
-}
-
-// Wrapper for calling TestListBucketsHandler tests for both XL multiple disks and single node setup.
-func TestListBucketsHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testListBucketsHandler, []string{"ListBuckets"})
-}
-
-// testListBucketsHandler - Tests validate listing of buckets.
-func testListBucketsHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-
-	testCases := []struct {
-		bucketName         string
-		accessKey          string
-		secretKey          string
-		expectedRespStatus int
-	}{
-		// Test case - 1.
-		// Validate a good case request succeeds.
-		{
-			bucketName:         bucketName,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusOK,
-		},
-		// Test case - 2.
-		// Test case with invalid accessKey to produce and validate Signature MisMatch error.
-		{
-			bucketName:         bucketName,
-			accessKey:          "abcd",
-			secretKey:          "abcd",
-			expectedRespStatus: http.StatusForbidden,
-		},
-	}
-
-	for i, testCase := range testCases {
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		rec := httptest.NewRecorder()
-		req, lerr := newTestSignedRequestV4("GET", getListBucketURL(""), 0, nil, testCase.accessKey, testCase.secretKey)
-		if lerr != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for ListBucketsHandler: <ERROR> %v", i+1, instanceType, lerr)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(rec, req)
-		if rec.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, rec.Code)
-		}
-
-		// Verify response of the V2 signed HTTP request.
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for PUT bucket policy endpoint.
-
-		// verify response for V2 signed HTTP request.
-		reqV2, err := newTestSignedRequestV2("GET", getListBucketURL(""), 0, nil, testCase.accessKey, testCase.secretKey)
-
-		if err != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, instanceType, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		if recV2.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, recV2.Code)
-		}
-	}
-
-	// Test for Anonymous/unsigned http request.
-	// ListBucketsHandler doesn't support bucket policies, setting the policies shouldn't make a difference.
-	anonReq, err := newTestRequest("GET", getListBucketURL(""), 0, nil)
-
-	if err != nil {
-		t.Fatalf("Minio %s: Failed to create an anonymous request.", instanceType)
-	}
-
-	// ExecObjectLayerAPIAnonTest - Calls the HTTP API handler using the anonymous request, validates the ErrAccessDeniedResponse,
-	// sets the bucket policy using the policy statement generated from `getWriteOnlyObjectStatement` so that the
-	// unsigned request goes through and its validated again.
-	ExecObjectLayerAPIAnonTest(t, "ListBucketsHandler", "", "", instanceType, apiRouter, anonReq, getWriteOnlyObjectStatement)
-
-	// HTTP request for testing when `objectLayer` is set to `nil`.
-	// There is no need to use an existing bucket and valid input for creating the request
-	// since the `objectLayer==nil`  check is performed before any other checks inside the handlers.
-	// The only aim is to generate an HTTP request in a way that the relevant/registered end point is evoked/called.
-
-	nilReq, err := newTestRequest("GET", getListBucketURL(""), 0, nil)
-
-	if err != nil {
-		t.Errorf("Minio %s: Failed to create HTTP request for testing the response when object Layer is set to `nil`.", instanceType)
-	}
-	// execute the object layer set to `nil` test.
-	// `ExecObjectLayerAPINilTest` manages the operation.
-	ExecObjectLayerAPINilTest(t, "", "", instanceType, apiRouter, nilReq)
-}
-
-// Wrapper for calling DeleteMultipleObjects HTTP handler tests for both XL multiple disks and single node setup.
-func TestAPIDeleteMultipleObjectsHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testAPIDeleteMultipleObjectsHandler, []string{"DeleteMultipleObjects"})
-}
-
-func testAPIDeleteMultipleObjectsHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	initBucketPolicies(obj)
-
-	var err error
-	// register event notifier.
-	err = initEventNotifier(obj)
-	if err != nil {
-		t.Fatal("Notifier initialization failed.")
-	}
-
-	contentBytes := []byte("hello")
-	sha256sum := ""
-	var objectNames []string
-	for i := 0; i < 10; i++ {
-		objectName := "test-object-" + strconv.Itoa(i)
-		// uploading the object.
-		_, err = obj.PutObject(bucketName, objectName, int64(len(contentBytes)), bytes.NewBuffer(contentBytes),
-			make(map[string]string), sha256sum)
-		// if object upload fails stop the test.
-		if err != nil {
-			t.Fatalf("Put Object %d:  Error uploading object: <ERROR> %v", i, err)
-		}
-
-		// object used for the test.
-		objectNames = append(objectNames, objectName)
-	}
-
-	getObjectIdentifierList := func(objectNames []string) (objectIdentifierList []ObjectIdentifier) {
-		for _, objectName := range objectNames {
-			objectIdentifierList = append(objectIdentifierList, ObjectIdentifier{objectName})
-		}
-
-		return objectIdentifierList
-	}
-
-	requestList := []DeleteObjectsRequest{
-		{Quiet: false, Objects: getObjectIdentifierList(objectNames[:5])},
-		{Quiet: true, Objects: getObjectIdentifierList(objectNames[5:])},
-	}
-
-	// generate multi objects delete response.
-	successRequest0 := encodeResponse(requestList[0])
-	successResponse0 := generateMultiDeleteResponse(requestList[0].Quiet, requestList[0].Objects, nil)
-	encodedSuccessResponse0 := encodeResponse(successResponse0)
-
-	successRequest1 := encodeResponse(requestList[1])
-	successResponse1 := generateMultiDeleteResponse(requestList[1].Quiet, requestList[1].Objects, nil)
-	encodedSuccessResponse1 := encodeResponse(successResponse1)
-
-	// generate multi objects delete response for errors.
-	// errorRequest := encodeResponse(requestList[1])
-	errorResponse := generateMultiDeleteResponse(requestList[1].Quiet, requestList[1].Objects, nil)
-	encodedErrorResponse := encodeResponse(errorResponse)
-
-	testCases := []struct {
-		bucket             string
-		objects            []byte
-		accessKey          string
-		secretKey          string
-		expectedContent    []byte
-		expectedRespStatus int
-	}{
-		// Test case - 1.
-		// Delete objects with invalid access key.
-		{
-			bucket:             bucketName,
-			objects:            successRequest0,
-			accessKey:          "Invalid-AccessID",
-			secretKey:          credentials.SecretAccessKey,
-			expectedContent:    nil,
-			expectedRespStatus: http.StatusForbidden,
-		},
-		// Test case - 2.
-		// Delete valid objects with quiet flag off.
-		{
-			bucket:             bucketName,
-			objects:            successRequest0,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedContent:    encodedSuccessResponse0,
-			expectedRespStatus: http.StatusOK,
-		},
-		// Test case - 3.
-		// Delete valid objects with quiet flag on.
-		{
-			bucket:             bucketName,
-			objects:            successRequest1,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedContent:    encodedSuccessResponse1,
-			expectedRespStatus: http.StatusOK,
-		},
-		// Test case - 4.
-		// Delete previously deleted objects.
-		{
-			bucket:             bucketName,
-			objects:            successRequest1,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedContent:    encodedErrorResponse,
-			expectedRespStatus: http.StatusOK,
-		},
-	}
-
-	for i, testCase := range testCases {
-		var req *http.Request
-		var actualContent []byte
-
-		// Indicating that all parts are uploaded and initiating completeMultipartUpload.
-		req, err = newTestSignedRequestV4("POST", getDeleteMultipleObjectsURL("", bucketName),
-			int64(len(testCase.objects)), bytes.NewReader(testCase.objects), testCase.accessKey, testCase.secretKey)
-		if err != nil {
-			t.Fatalf("Failed to create HTTP request for DeleteMultipleObjects: <ERROR> %v", err)
-		}
-
-		rec := httptest.NewRecorder()
-
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to executes the registered handler.
-		apiRouter.ServeHTTP(rec, req)
-		// Assert the response code with the expected status.
-		if rec.Code != testCase.expectedRespStatus {
-			t.Errorf("Case %d: Minio %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, rec.Code)
-		}
-
-		// read the response body.
-		actualContent, err = ioutil.ReadAll(rec.Body)
-		if err != nil {
-			t.Fatalf("Test %d : Minio %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err)
-		}
-
-		// Verify whether the bucket obtained object is same as the one created.
-		if testCase.expectedContent != nil && !bytes.Equal(testCase.expectedContent, actualContent) {
-			t.Errorf("Test %d : Minio %s: Object content differs from expected value.", i+1, instanceType)
-		}
-	}
-
-	// Currently anonymous user cannot delete multiple objects in Minio server, hence no test case is required.
-
-	// HTTP request to test the case of `objectLayer` being set to `nil`.
-	// There is no need to use an existing bucket or valid input for creating the request,
-	// since the `objectLayer==nil`  check is performed before any other checks inside the handlers.
-	// The only aim is to generate an HTTP request in a way that the relevant/registered end point is evoked/called.
-	// Indicating that all parts are uploaded and initiating completeMultipartUpload.
-	nilBucket := "dummy-bucket"
-	nilObject := ""
-
-	nilReq, err := newTestSignedRequestV4("POST", getDeleteMultipleObjectsURL("", nilBucket), 0, nil, "", "")
-	if err != nil {
-		t.Errorf("Minio %s: Failed to create HTTP request for testing the response when object Layer is set to `nil`.", instanceType)
-	}
-	// execute the object layer set to `nil` test.
-	// `ExecObjectLayerAPINilTest` manages the operation.
-	ExecObjectLayerAPINilTest(t, nilBucket, nilObject, instanceType, apiRouter, nilReq)
-}
@@ -1,129 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2014-2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import "encoding/json"
-
-// BucketMetaState - Interface to update bucket metadata in-memory
-// state.
-type BucketMetaState interface {
-	// Updates bucket notification
-	UpdateBucketNotification(args *SetBucketNotificationPeerArgs) error
-
-	// Updates bucket listener
-	UpdateBucketListener(args *SetBucketListenerPeerArgs) error
-
-	// Updates bucket policy
-	UpdateBucketPolicy(args *SetBucketPolicyPeerArgs) error
-
-	// Sends event
-	SendEvent(args *EventArgs) error
-}
-
-// Type that implements BucketMetaState for local node.
-type localBucketMetaState struct {
-	ObjectAPI func() ObjectLayer
-}
-
-// localBucketMetaState.UpdateBucketNotification - updates in-memory global bucket
-// notification info.
-func (lc *localBucketMetaState) UpdateBucketNotification(args *SetBucketNotificationPeerArgs) error {
-	// check if object layer is available.
-	objAPI := lc.ObjectAPI()
-	if objAPI == nil {
-		return errServerNotInitialized
-	}
-
-	globalEventNotifier.SetBucketNotificationConfig(args.Bucket, args.NCfg)
-
-	return nil
-}
-
-// localBucketMetaState.UpdateBucketListener - updates in-memory global bucket
-// listeners info.
-func (lc *localBucketMetaState) UpdateBucketListener(args *SetBucketListenerPeerArgs) error {
-	// check if object layer is available.
-	objAPI := lc.ObjectAPI()
-	if objAPI == nil {
-		return errServerNotInitialized
-	}
-
-	// Update in-memory notification config.
-	return globalEventNotifier.SetBucketListenerConfig(args.Bucket, args.LCfg)
-}
-
-// localBucketMetaState.UpdateBucketPolicy - updates in-memory global bucket
-// policy info.
-func (lc *localBucketMetaState) UpdateBucketPolicy(args *SetBucketPolicyPeerArgs) error {
-	// check if object layer is available.
-	objAPI := lc.ObjectAPI()
-	if objAPI == nil {
-		return errServerNotInitialized
-	}
-
-	var pCh policyChange
-	if err := json.Unmarshal(args.PChBytes, &pCh); err != nil {
-		return err
-	}
-
-	return globalBucketPolicies.SetBucketPolicy(args.Bucket, pCh)
-}
-
-// localBucketMetaState.SendEvent - sends event to local event notifier via
-// `globalEventNotifier`
-func (lc *localBucketMetaState) SendEvent(args *EventArgs) error {
-	// check if object layer is available.
-	objAPI := lc.ObjectAPI()
-	if objAPI == nil {
-		return errServerNotInitialized
-	}
-
-	return globalEventNotifier.SendListenerEvent(args.Arn, args.Event)
-}
-
-// Type that implements BucketMetaState for remote node.
-type remoteBucketMetaState struct {
-	*AuthRPCClient
-}
-
-// remoteBucketMetaState.UpdateBucketNotification - sends bucket notification
-// change to remote peer via RPC call.
-func (rc *remoteBucketMetaState) UpdateBucketNotification(args *SetBucketNotificationPeerArgs) error {
-	reply := GenericReply{}
-	return rc.Call("S3.SetBucketNotificationPeer", args, &reply)
-}
-
-// remoteBucketMetaState.UpdateBucketListener - sends bucket listener change to
-// remote peer via RPC call.
-func (rc *remoteBucketMetaState) UpdateBucketListener(args *SetBucketListenerPeerArgs) error {
-	reply := GenericReply{}
-	return rc.Call("S3.SetBucketListenerPeer", args, &reply)
-}
-
-// remoteBucketMetaState.UpdateBucketPolicy - sends bucket policy change to remote
-// peer via RPC call.
-func (rc *remoteBucketMetaState) UpdateBucketPolicy(args *SetBucketPolicyPeerArgs) error {
-	reply := GenericReply{}
-	return rc.Call("S3.SetBucketPolicyPeer", args, &reply)
-}
-
-// remoteBucketMetaState.SendEvent - sends event for bucket listener to remote
-// peer via RPC call.
-func (rc *remoteBucketMetaState) SendEvent(args *EventArgs) error {
-	reply := GenericReply{}
-	return rc.Call("S3.Event", args, &reply)
-}
@@ -32,32 +32,30 @@ type keyFilter struct {
 	FilterRules []filterRule `xml:"FilterRule,omitempty"`
 }

-type filterStruct struct {
-	Key keyFilter `xml:"S3Key,omitempty" json:"S3Key,omitempty"`
-}
-
-// ServiceConfig - Common elements of service notification.
-type ServiceConfig struct {
-	Events []string     `xml:"Event" json:"Event"`
-	Filter filterStruct `xml:"Filter" json:"Filter"`
-	ID     string       `xml:"Id" json:"Id"`
+// Common elements of service notification.
+type serviceConfig struct {
+	Events []string `xml:"Event"`
+	Filter struct {
+		Key keyFilter `xml:"S3Key,omitempty"`
+	}
+	ID string `xml:"Id"`
 }

 // Queue SQS configuration.
 type queueConfig struct {
-	ServiceConfig
+	serviceConfig
 	QueueARN string `xml:"Queue"`
 }

 // Topic SNS configuration, this is a compliance field not used by minio yet.
 type topicConfig struct {
-	ServiceConfig
-	TopicARN string `xml:"Topic" json:"Topic"`
+	serviceConfig
+	TopicARN string `xml:"Topic"`
 }

 // Lambda function configuration, this is a compliance field not used by minio yet.
 type lambdaConfig struct {
-	ServiceConfig
+	serviceConfig
 	LambdaARN string `xml:"CloudFunction"`
 }

@@ -66,16 +64,10 @@ type lambdaConfig struct {
 type notificationConfig struct {
 	XMLName       xml.Name       `xml:"NotificationConfiguration"`
 	QueueConfigs  []queueConfig  `xml:"QueueConfiguration"`
+	TopicConfigs  []topicConfig  `xml:"TopicConfiguration"`
 	LambdaConfigs []lambdaConfig `xml:"CloudFunctionConfiguration"`
 }

-// listenerConfig structure represents run-time notification
-// configuration for live listeners
-type listenerConfig struct {
-	TopicConfig  topicConfig `json:"TopicConfiguration"`
-	TargetServer string      `json:"TargetServer"`
-}
-
 // Internal error used to signal notifications not set.
 var errNoSuchNotifications = errors.New("The specified bucket does not have bucket notifications")

@@ -160,6 +152,17 @@ type NotificationEvent struct {
 	S3                eventMeta         `json:"s3"`
 }

+// Represents the minio topic type and account id's.
+type arnTopic struct {
+	Type      string
+	AccountID string
+}
+
+// Stringer for constructing AWS ARN compatible string.
+func (m arnTopic) String() string {
+	return minioTopic + serverConfig.GetRegion() + ":" + m.AccountID + ":" + m.Type
+}
+
 // Represents the minio sqs type and account id's.
 type arnSQS struct {
 	Type      string
@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"encoding/xml"
-	"fmt"
 	"io"
 	"net/http"
 	"path"
@@ -32,7 +31,6 @@ import (
 const (
 	bucketConfigPrefix       = "buckets"
 	bucketNotificationConfig = "notification.xml"
-	bucketListenerConfig     = "listener.json"
 )

 // GetBucketNotificationHandler - This implementation of the GET
@@ -41,29 +39,15 @@ const (
 // not enabled on the bucket, the operation returns an empty
 // NotificationConfiguration element.
 func (api objectAPIHandlers) GetBucketNotificationHandler(w http.ResponseWriter, r *http.Request) {
-	objAPI := api.ObjectAPI()
-	if objAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, "", "", serverConfig.GetRegion()); s3Error != ErrNone {
+	// Validate request authorization.
+	if s3Error := checkAuth(r); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
-
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]
-
-	_, err := objAPI.GetBucketInfo(bucket)
-	if err != nil {
-		errorIf(err, "Unable to find bucket info.")
-		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
-		return
-	}
-
 	// Attempt to successfully load notification config.
-	nConfig, err := loadNotificationConfig(bucket, objAPI)
+	nConfig, err := loadNotificationConfig(bucket, api.ObjectAPI)
 	if err != nil && err != errNoSuchNotifications {
 		errorIf(err, "Unable to read notification configuration.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
@@ -94,21 +78,15 @@ func (api objectAPIHandlers) GetBucketNotificationHandler(w http.ResponseWriter,
 // By default, your bucket has no event notifications configured. That is,
 // the notification configuration will be an empty NotificationConfiguration.
 func (api objectAPIHandlers) PutBucketNotificationHandler(w http.ResponseWriter, r *http.Request) {
-	objectAPI := api.ObjectAPI()
-	if objectAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, "", "", serverConfig.GetRegion()); s3Error != ErrNone {
+	// Validate request authorization.
+	if s3Error := checkAuth(r); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
-
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	_, err := objectAPI.GetBucketInfo(bucket)
+	_, err := api.ObjectAPI.GetBucketInfo(bucket)
 	if err != nil {
 		errorIf(err, "Unable to find bucket info.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
@@ -126,10 +104,11 @@ func (api objectAPIHandlers) PutBucketNotificationHandler(w http.ResponseWriter,

 	// Reads the incoming notification configuration.
 	var buffer bytes.Buffer
+	var bufferSize int64
 	if r.ContentLength >= 0 {
-		_, err = io.CopyN(&buffer, r.Body, r.ContentLength)
+		bufferSize, err = io.CopyN(&buffer, r.Body, r.ContentLength)
 	} else {
-		_, err = io.Copy(&buffer, r.Body)
+		bufferSize, err = io.Copy(&buffer, r.Body)
 	}
 	if err != nil {
 		errorIf(err, "Unable to read incoming body.")
@@ -152,45 +131,22 @@ func (api objectAPIHandlers) PutBucketNotificationHandler(w http.ResponseWriter,
 		return
 	}

-	// Put bucket notification config.
-	err = PutBucketNotificationConfig(bucket, &notificationCfg, objectAPI)
+	// Proceed to save notification configuration.
+	notificationConfigPath := path.Join(bucketConfigPrefix, bucket, bucketNotificationConfig)
+	_, err = api.ObjectAPI.PutObject(minioMetaBucket, notificationConfigPath, bufferSize, bytes.NewReader(buffer.Bytes()), nil)
 	if err != nil {
+		errorIf(err, "Unable to write bucket notification configuration.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
 		return
 	}

+	// Set bucket notification config.
+	globalEventNotifier.SetBucketNotificationConfig(bucket, &notificationCfg)
+
 	// Success.
 	writeSuccessResponse(w, nil)
 }

-// PutBucketNotificationConfig - Put a new notification config for a
-// bucket (overwrites any previous config) persistently, updates
-// global in-memory state, and notify other nodes in the cluster (if
-// any)
-func PutBucketNotificationConfig(bucket string, ncfg *notificationConfig, objAPI ObjectLayer) error {
-	if ncfg == nil {
-		return errInvalidArgument
-	}
-
-	// Acquire a write lock on bucket before modifying its
-	// configuration.
-	bucketLock := nsMutex.NewNSLock(bucket, "")
-	bucketLock.Lock()
-	// Release lock after notifying peers
-	defer bucketLock.Unlock()
-
-	// persist config to disk
-	err := persistNotificationConfig(bucket, ncfg, objAPI)
-	if err != nil {
-		return fmt.Errorf("Unable to persist Bucket notification config to object layer - config=%v errMsg=%v", *ncfg, err)
-	}
-
-	// All servers (including local) are told to update in-memory config
-	S3PeersUpdateBucketNotification(bucket, ncfg)
-
-	return nil
-}
-
 // writeNotification marshals notification message before writing to client.
 func writeNotification(w http.ResponseWriter, notification map[string][]NotificationEvent) error {
 	// Invalid response writer.
@@ -201,7 +157,7 @@ func writeNotification(w http.ResponseWriter, notification map[string][]Notifica
 	if notification == nil {
 		return errInvalidArgument
 	}
-	// Marshal notification data into JSON and write to client.
+	// Marshal notification data into XML and write to client.
 	notificationBytes, err := json.Marshal(&notification)
 	if err != nil {
 		return err
@@ -224,6 +180,8 @@ var crlf = []byte("\r\n")
 // for each notification input, otherwise writes whitespace characters periodically
 // to keep the connection active. Each notification messages are terminated by CRLF
 // character. Upon any error received on response writer the for loop exits.
+//
+// TODO - do not log for all errors.
 func sendBucketNotification(w http.ResponseWriter, arnListenerCh <-chan []NotificationEvent) {
 	var dummyEvents = map[string][]NotificationEvent{"Records": nil}
 	// Continuously write to client either timely empty structures
@@ -235,9 +193,8 @@ func sendBucketNotification(w http.ResponseWriter, arnListenerCh <-chan []Notifi
 				errorIf(err, "Unable to write notification to client.")
 				return
 			}
-		case <-time.After(globalSNSConnAlive): // Wait for global conn active seconds.
+		case <-time.After(5 * time.Second):
 			if err := writeNotification(w, dummyEvents); err != nil {
-				// FIXME - do not log for all errors.
 				errorIf(err, "Unable to write notification to client.")
 				return
 			}
@@ -247,201 +204,59 @@ func sendBucketNotification(w http.ResponseWriter, arnListenerCh <-chan []Notifi

 // ListenBucketNotificationHandler - list bucket notifications.
 func (api objectAPIHandlers) ListenBucketNotificationHandler(w http.ResponseWriter, r *http.Request) {
-	// Validate if bucket exists.
-	objAPI := api.ObjectAPI()
-	if objAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, "", "", serverConfig.GetRegion()); s3Error != ErrNone {
+	// Validate request authorization.
+	if s3Error := checkAuth(r); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
-
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	// Parse listen bucket notification resources.
-	prefixes, suffixes, events := getListenBucketNotificationResources(r.URL.Query())
-
-	if err := validateFilterValues(prefixes); err != ErrNone {
-		writeErrorResponse(w, r, err, r.URL.Path)
+	// Get notification ARN.
+	topicARN := r.URL.Query().Get("notificationARN")
+	if topicARN == "" {
+		writeErrorResponse(w, r, ErrARNNotification, r.URL.Path)
 		return
 	}

-	if err := validateFilterValues(suffixes); err != ErrNone {
-		writeErrorResponse(w, r, err, r.URL.Path)
-		return
-	}
-
-	// Validate all the resource events.
-	for _, event := range events {
-		if errCode := checkEvent(event); errCode != ErrNone {
-			writeErrorResponse(w, r, errCode, r.URL.Path)
-			return
-		}
-	}
-
-	_, err := objAPI.GetBucketInfo(bucket)
+	// Validate if bucket exists.
+	_, err := api.ObjectAPI.GetBucketInfo(bucket)
 	if err != nil {
-		errorIf(err, "Unable to get bucket info.")
+		errorIf(err, "Unable to bucket info.")
 		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
 		return
 	}

-	accountID := fmt.Sprintf("%d", time.Now().UTC().UnixNano())
-	accountARN := fmt.Sprintf(
-		"%s:%s:%s:%s-%s",
-		minioTopic,
-		serverConfig.GetRegion(),
-		accountID,
-		snsTypeMinio,
-		globalMinioAddr,
-	)
-	var filterRules []filterRule
-
-	for _, prefix := range prefixes {
-		filterRules = append(filterRules, filterRule{
-			Name:  "prefix",
-			Value: prefix,
-		})
-	}
-
-	for _, suffix := range suffixes {
-		filterRules = append(filterRules, filterRule{
-			Name:  "suffix",
-			Value: suffix,
-		})
-	}
-
-	// Make topic configuration corresponding to this
-	// ListenBucketNotification request.
-	topicCfg := &topicConfig{
-		TopicARN: accountARN,
-		ServiceConfig: ServiceConfig{
-			Events: events,
-			Filter: struct {
-				Key keyFilter `xml:"S3Key,omitempty" json:"S3Key,omitempty"`
-			}{
-				Key: keyFilter{
-					FilterRules: filterRules,
-				},
-			},
-			ID: "sns-" + accountID,
-		},
-	}
-
-	// Setup a listening channel that will receive notifications
-	// from the RPC handler.
-	nEventCh := make(chan []NotificationEvent)
-	defer close(nEventCh)
-	// Add channel for listener events
-	if err = globalEventNotifier.AddListenerChan(accountARN, nEventCh); err != nil {
-		errorIf(err, "Error adding a listener!")
-		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
+	notificationCfg := globalEventNotifier.GetBucketNotificationConfig(bucket)
+	if notificationCfg == nil {
+		writeErrorResponse(w, r, ErrARNNotification, r.URL.Path)
 		return
 	}
-	// Remove listener channel after the writer has closed or the
-	// client disconnected.
-	defer globalEventNotifier.RemoveListenerChan(accountARN)

-	// Update topic config to bucket config and persist - as soon
-	// as this call compelets, events may start appearing in
-	// nEventCh
-	lc := listenerConfig{
-		TopicConfig:  *topicCfg,
-		TargetServer: globalMinioAddr,
-	}
-
-	err = AddBucketListenerConfig(bucket, &lc, objAPI)
-	if err != nil {
-		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
+	// Set SNS notifications only if special "listen" sns is set in bucket
+	// notification configs.
+	if !isMinioSNSConfigured(topicARN, notificationCfg.TopicConfigs) {
+		writeErrorResponse(w, r, ErrARNNotification, r.URL.Path)
 		return
 	}
-	defer RemoveBucketListenerConfig(bucket, &lc, objAPI)

 	// Add all common headers.
 	setCommonHeaders(w)

+	// Create a new notification event channel.
+	nEventCh := make(chan []NotificationEvent)
+	// Close the listener channel.
+	defer close(nEventCh)
+
+	// Set sns target.
+	globalEventNotifier.SetSNSTarget(topicARN, nEventCh)
+	// Remove sns listener after the writer has closed or the client disconnected.
+	defer globalEventNotifier.RemoveSNSTarget(topicARN, nEventCh)
+
 	// Start sending bucket notifications.
 	sendBucketNotification(w, nEventCh)
 }

-// AddBucketListenerConfig - Updates on disk state of listeners, and
-// updates all peers with the change in listener config.
-func AddBucketListenerConfig(bucket string, lcfg *listenerConfig, objAPI ObjectLayer) error {
-	if lcfg == nil {
-		return errInvalidArgument
-	}
-	listenerCfgs := globalEventNotifier.GetBucketListenerConfig(bucket)
-
-	// add new lid to listeners and persist to object layer.
-	listenerCfgs = append(listenerCfgs, *lcfg)
-
-	// Acquire a write lock on bucket before modifying its
-	// configuration.
-	bucketLock := nsMutex.NewNSLock(bucket, "")
-	bucketLock.Lock()
-	// Release lock after notifying peers
-	defer bucketLock.Unlock()
-
-	// update persistent config if dist XL
-	if globalIsDistXL {
-		err := persistListenerConfig(bucket, listenerCfgs, objAPI)
-		if err != nil {
-			errorIf(err, "Error persisting listener config when adding a listener.")
-			return err
-		}
-	}
-
-	// persistence success - now update in-memory globals on all
-	// peers (including local)
-	S3PeersUpdateBucketListener(bucket, listenerCfgs)
-	return nil
-}
-
-// RemoveBucketListenerConfig - removes a given bucket notification config
-func RemoveBucketListenerConfig(bucket string, lcfg *listenerConfig, objAPI ObjectLayer) {
-	listenerCfgs := globalEventNotifier.GetBucketListenerConfig(bucket)
-
-	// remove listener with matching ARN - if not found ignore and
-	// exit.
-	var updatedLcfgs []listenerConfig
-	found := false
-	for k, configuredLcfg := range listenerCfgs {
-		if configuredLcfg.TopicConfig.TopicARN == lcfg.TopicConfig.TopicARN {
-			updatedLcfgs = append(listenerCfgs[:k],
-				listenerCfgs[k+1:]...)
-			found = true
-			break
-		}
-	}
-	if !found {
-		return
-	}
-
-	// Acquire a write lock on bucket before modifying its
-	// configuration.
-	bucketLock := nsMutex.NewNSLock(bucket, "")
-	bucketLock.Lock()
-	// Release lock after notifying peers
-	defer bucketLock.Unlock()
-
-	// update persistent config if dist XL
-	if globalIsDistXL {
-		err := persistListenerConfig(bucket, updatedLcfgs, objAPI)
-		if err != nil {
-			errorIf(err, "Error persisting listener config when removing a listener.")
-			return
-		}
-	}
-
-	// persistence success - now update in-memory globals on all
-	// peers (including local)
-	S3PeersUpdateBucketListener(bucket, updatedLcfgs)
-}
-
 // Removes notification.xml for a given bucket, only used during DeleteBucket.
 func removeNotificationConfig(bucket string, objAPI ObjectLayer) error {
 	// Verify bucket is valid.
@@ -1,31 +1,10 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package cmd

 import (
-	"bufio"
 	"bytes"
-	"encoding/json"
-	"encoding/xml"
 	"io"
 	"io/ioutil"
 	"net/http"
-	"net/http/httptest"
-	"reflect"
 	"testing"
 )

@@ -40,7 +19,7 @@ func (f *flushWriter) Write(b []byte) (n int, err error) { return f.Writer.Write
 func (f *flushWriter) Header() http.Header               { return http.Header{} }
 func (f *flushWriter) WriteHeader(code int)              {}

-func newFlushWriter(writer io.Writer) http.ResponseWriter {
+func newFlushWriter(writer io.Writer) *flushWriter {
 	return &flushWriter{writer}
 }

@@ -56,7 +35,7 @@ func TestWriteNotification(t *testing.T) {
 	var buffer bytes.Buffer
 	// Collection of test cases for each event writer.
 	testCases := []struct {
-		writer http.ResponseWriter
+		writer *flushWriter
 		event  map[string][]NotificationEvent
 		err    error
 	}{
@@ -109,215 +88,3 @@ func TestWriteNotification(t *testing.T) {
 		}
 	}
 }
-
-func TestSendBucketNotification(t *testing.T) {
-	// Initialize a new test config.
-	root, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Unable to initialize test config %s", err)
-	}
-	defer removeAll(root)
-
-	eventCh := make(chan []NotificationEvent)
-
-	// Create a Pipe with FlushWriter on the write-side and bufio.Scanner
-	// on the reader-side to receive notification over the listen channel in a
-	// synchronized manner.
-	pr, pw := io.Pipe()
-	fw := newFlushWriter(pw)
-	scanner := bufio.NewScanner(pr)
-	// Start a go-routine to wait for notification events.
-	go func(listenerCh <-chan []NotificationEvent) {
-		sendBucketNotification(fw, listenerCh)
-	}(eventCh)
-
-	// Construct notification events to be passed on the events channel.
-	var events []NotificationEvent
-	evTypes := []EventName{
-		ObjectCreatedPut,
-		ObjectCreatedPost,
-		ObjectCreatedCopy,
-		ObjectCreatedCompleteMultipartUpload,
-	}
-	for _, evType := range evTypes {
-		events = append(events, newNotificationEvent(eventData{
-			Type: evType,
-		}))
-	}
-	// Send notification events to the channel on which sendBucketNotification
-	// is waiting on.
-	eventCh <- events
-
-	// Read from the pipe connected to the ResponseWriter.
-	scanner.Scan()
-	notificationBytes := scanner.Bytes()
-
-	// Close the read-end and send an empty notification event on the channel
-	// to signal sendBucketNotification to terminate.
-	pr.Close()
-	eventCh <- []NotificationEvent{}
-	close(eventCh)
-
-	// Checking if the notification are the same as those sent over the channel.
-	var notifications map[string][]NotificationEvent
-	err = json.Unmarshal(notificationBytes, &notifications)
-	if err != nil {
-		t.Fatal("Failed to Unmarshal notification")
-	}
-	records := notifications["Records"]
-	for i, rec := range records {
-		if rec.EventName == evTypes[i].String() {
-			continue
-		}
-		t.Errorf("Failed to receive %d event %s", i, evTypes[i].String())
-	}
-}
-
-func TestGetBucketNotificationHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testGetBucketNotificationHandler, []string{
-		"GetBucketNotification",
-	})
-}
-
-func testGetBucketNotificationHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	// declare sample configs
-	filterRules := []filterRule{
-		{
-			Name:  "prefix",
-			Value: "minio",
-		},
-		{
-			Name:  "suffix",
-			Value: "*.jpg",
-		},
-	}
-	sampleSvcCfg := ServiceConfig{
-		[]string{"s3:ObjectRemoved:*", "s3:ObjectCreated:*"},
-		filterStruct{
-			keyFilter{filterRules},
-		},
-		"1",
-	}
-	sampleNotifCfg := notificationConfig{
-		QueueConfigs: []queueConfig{
-			{
-				ServiceConfig: sampleSvcCfg,
-				QueueARN:      "testqARN",
-			},
-		},
-	}
-	rec := httptest.NewRecorder()
-	req, err := newTestSignedRequestV4("GET", getGetBucketNotificationURL("", bucketName),
-		0, nil, credentials.AccessKeyID, credentials.SecretAccessKey)
-	if err != nil {
-		t.Fatalf("%s: Failed to create HTTP testRequest for ListenBucketNotification: <ERROR> %v", instanceType, err)
-	}
-	apiRouter.ServeHTTP(rec, req)
-	if rec.Code != http.StatusOK {
-		t.Fatalf("Unexpected http response %d", rec.Code)
-	}
-	if err = persistNotificationConfig(bucketName, &sampleNotifCfg, obj); err != nil {
-		t.Fatalf("Unable to save notification config %s", err)
-	}
-	rec = httptest.NewRecorder()
-	req, err = newTestSignedRequestV4("GET", getGetBucketNotificationURL("", bucketName),
-		0, nil, credentials.AccessKeyID, credentials.SecretAccessKey)
-	if err != nil {
-		t.Fatalf("%s: Failed to create HTTP testRequest for ListenBucketNotification: <ERROR> %v", instanceType, err)
-	}
-	apiRouter.ServeHTTP(rec, req)
-	if rec.Code != http.StatusOK {
-		t.Fatalf("Unexpected http response %d", rec.Code)
-	}
-	notificationBytes, err := ioutil.ReadAll(rec.Body)
-	if err != nil {
-		t.Fatalf("Unexpected error %s", err)
-	}
-	nConfig := notificationConfig{}
-	if err = xml.Unmarshal(notificationBytes, &nConfig); err != nil {
-		t.Fatalf("Unexpected XML received %s", err)
-	}
-	if sampleNotifCfg.QueueConfigs[0].QueueARN != nConfig.QueueConfigs[0].QueueARN {
-		t.Fatalf("Uexpected notification configs expected %#v, got %#v", sampleNotifCfg, nConfig)
-	}
-	if !reflect.DeepEqual(sampleNotifCfg.QueueConfigs[0].Events, nConfig.QueueConfigs[0].Events) {
-		t.Fatalf("Uexpected notification configs expected %#v, got %#v", sampleNotifCfg, nConfig)
-	}
-}
-
-func TestListenBucketNotificationNilHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testListenBucketNotificationNilHandler, []string{
-		"ListenBucketNotification",
-		"PutObject",
-	})
-}
-
-func testListenBucketNotificationNilHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	// get random bucket name.
-	randBucket := getRandomBucketName()
-
-	// Nil Object layer
-	nilAPIRouter := initTestAPIEndPoints(nil, []string{
-		"ListenBucketNotification",
-	})
-	testRec := httptest.NewRecorder()
-	testReq, tErr := newTestSignedRequestV4("GET",
-		getListenBucketNotificationURL("", randBucket, []string{},
-			[]string{"*.jpg"}, []string{
-				"s3:ObjectCreated:*",
-				"s3:ObjectRemoved:*",
-			}), 0, nil, credentials.AccessKeyID, credentials.SecretAccessKey)
-	if tErr != nil {
-		t.Fatalf("%s: Failed to create HTTP testRequest for ListenBucketNotification: <ERROR> %v", instanceType, tErr)
-	}
-	nilAPIRouter.ServeHTTP(testRec, testReq)
-	if testRec.Code != http.StatusServiceUnavailable {
-		t.Fatalf("Test 1: %s: expected HTTP code %d, but received %d: <ERROR> %v",
-			instanceType, http.StatusServiceUnavailable, testRec.Code, tErr)
-	}
-}
-
-func testRemoveNotificationConfig(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	invalidBucket := "Invalid\\Bucket"
-	// get random bucket name.
-	randBucket := bucketName
-
-	sampleNotificationBytes := []byte("<NotificationConfiguration><TopicConfiguration>" +
-		"<Event>s3:ObjectCreated:*</Event><Event>s3:ObjectRemoved:*</Event><Filter>" +
-		"<S3Key></S3Key></Filter><Id></Id><Topic>arn:minio:sns:us-east-1:1474332374:listen</Topic>" +
-		"</TopicConfiguration></NotificationConfiguration>")
-
-	// Set sample bucket notification on randBucket.
-	testRec := httptest.NewRecorder()
-	testReq, tErr := newTestSignedRequestV4("PUT", getPutBucketNotificationURL("", randBucket),
-		int64(len(sampleNotificationBytes)), bytes.NewReader(sampleNotificationBytes),
-		credentials.AccessKeyID, credentials.SecretAccessKey)
-	if tErr != nil {
-		t.Fatalf("%s: Failed to create HTTP testRequest for PutBucketNotification: <ERROR> %v", instanceType, tErr)
-	}
-	apiRouter.ServeHTTP(testRec, testReq)
-
-	testCases := []struct {
-		bucketName  string
-		expectedErr error
-	}{
-		{invalidBucket, BucketNameInvalid{Bucket: invalidBucket}},
-		{randBucket, nil},
-	}
-	for i, test := range testCases {
-		tErr := removeNotificationConfig(test.bucketName, obj)
-		if tErr != test.expectedErr {
-			t.Errorf("Test %d: %s expected error %v, but received %v", i+1, instanceType, test.expectedErr, tErr)
-		}
-	}
-}
-
-func TestRemoveNotificationConfig(t *testing.T) {
-	ExecObjectLayerAPITest(t, testRemoveNotificationConfig, []string{
-		"PutBucketNotification",
-		"ListenBucketNotification",
-	})
-}
@@ -126,27 +126,55 @@ func checkQueueARN(queueARN string) APIErrorCode {
 	return checkARN(queueARN, minioSqs)
 }

+// checkTopicARN - check if the topic arn is valid.
+func checkTopicARN(topicARN string) APIErrorCode {
+	return checkARN(topicARN, minioTopic)
+}
+
+// Returns true if the topicARN is for an Minio sns listen type.
+func isMinioSNS(topicARN arnTopic) bool {
+	return strings.HasSuffix(topicARN.Type, snsTypeMinio)
+}
+
+// isMinioSNSConfigured - verifies if one topic ARN is valid and is enabled.
+func isMinioSNSConfigured(topicARN string, topicConfigs []topicConfig) bool {
+	for _, topicConfig := range topicConfigs {
+		// Validate if topic ARN is already enabled.
+		if topicARN == topicConfig.TopicARN {
+			return true
+		}
+	}
+	return false
+}
+
+// Validate if we recognize the queue type.
+func isValidQueue(sqsARN arnSQS) bool {
+	amqpQ := isAMQPQueue(sqsARN)       // Is amqp queue?.
+	elasticQ := isElasticQueue(sqsARN) // Is elastic queue?.
+	redisQ := isRedisQueue(sqsARN)     // Is redis queue?.
+	return amqpQ || elasticQ || redisQ
+}
+
+// Validate if we recognize the topic type.
+func isValidTopic(topicARN arnTopic) bool {
+	return isMinioSNS(topicARN) // Is minio topic?.
+}
+
 // Validates account id for input queue ARN.
 func isValidQueueID(queueARN string) bool {
 	// Unmarshals QueueARN into structured object.
 	sqsARN := unmarshalSqsARN(queueARN)
-	// Is Queue identifier valid?.
-	if isAMQPQueue(sqsARN) { // AMQP eueue.
+	// AMQP queue.
+	if isAMQPQueue(sqsARN) {
 		amqpN := serverConfig.GetAMQPNotifyByID(sqsARN.AccountID)
 		return amqpN.Enable && amqpN.URL != ""
-	} else if isNATSQueue(sqsARN) {
-		natsN := serverConfig.GetNATSNotifyByID(sqsARN.AccountID)
-		return natsN.Enable && natsN.Address != ""
 	} else if isElasticQueue(sqsARN) { // Elastic queue.
 		elasticN := serverConfig.GetElasticSearchNotifyByID(sqsARN.AccountID)
 		return elasticN.Enable && elasticN.URL != ""
+
 	} else if isRedisQueue(sqsARN) { // Redis queue.
 		redisN := serverConfig.GetRedisNotifyByID(sqsARN.AccountID)
 		return redisN.Enable && redisN.Addr != ""
-	} else if isPostgreSQLQueue(sqsARN) {
-		pgN := serverConfig.GetPostgreSQLNotifyByID(sqsARN.AccountID)
-		// Postgres can work with only default conn. info.
-		return pgN.Enable
 	}
 	return false
 }
@@ -158,6 +186,13 @@ func checkQueueConfig(qConfig queueConfig) APIErrorCode {
 		return s3Error
 	}

+	// Unmarshals QueueARN into structured object.
+	sqsARN := unmarshalSqsARN(qConfig.QueueARN)
+	// Validate if sqsARN requested any of the known supported queues.
+	if !isValidQueue(sqsARN) {
+		return ErrARNNotification
+	}
+
 	// Validate if the account ID is correct.
 	if !isValidQueueID(qConfig.QueueARN) {
 		return ErrARNNotification
@@ -177,6 +212,34 @@ func checkQueueConfig(qConfig queueConfig) APIErrorCode {
 	return ErrNone
 }

+// Check - validates queue configuration and returns error if any.
+func checkTopicConfig(tConfig topicConfig) APIErrorCode {
+	// Check queue arn is valid.
+	if s3Error := checkTopicARN(tConfig.TopicARN); s3Error != ErrNone {
+		return s3Error
+	}
+
+	// Unmarshals QueueARN into structured object.
+	topicARN := unmarshalTopicARN(tConfig.TopicARN)
+	// Validate if topicARN requested any of the known supported queues.
+	if !isValidTopic(topicARN) {
+		return ErrARNNotification
+	}
+
+	// Check if valid events are set in queue config.
+	if s3Error := checkEvents(tConfig.Events); s3Error != ErrNone {
+		return s3Error
+	}
+
+	// Check if valid filters are set in queue config.
+	if s3Error := checkFilterRules(tConfig.Filter.Key.FilterRules); s3Error != ErrNone {
+		return s3Error
+	}
+
+	// Success.
+	return ErrNone
+}
+
 // Validates all incoming queue configs, checkQueueConfig validates if the
 // input fields for each queues is not malformed and has valid configuration
 // information.  If validation fails bucket notifications are not enabled.
@@ -190,19 +253,53 @@ func validateQueueConfigs(queueConfigs []queueConfig) APIErrorCode {
 	return ErrNone
 }

+// Validates all incoming topic configs, checkTopicConfig validates if the
+// input fields for each queues is not malformed and has valid configuration
+// information.  If validation fails bucket notifications are not enabled.
+func validateTopicConfigs(topicConfigs []topicConfig) APIErrorCode {
+	for _, tConfig := range topicConfigs {
+		if s3Error := checkTopicConfig(tConfig); s3Error != ErrNone {
+			return s3Error
+		}
+	}
+	// Success.
+	return ErrNone
+}
+
 // Check all the queue configs for any duplicates.
 func checkDuplicateQueueConfigs(configs []queueConfig) APIErrorCode {
-	var queueConfigARNS []string
+	configMaps := make(map[string]int)

 	// Navigate through each configs and count the entries.
 	for _, config := range configs {
-		queueConfigARNS = append(queueConfigARNS, config.QueueARN)
+		configMaps[config.QueueARN]++
 	}

-	// Check if there are any duplicate counts.
-	if err := checkDuplicateStrings(queueConfigARNS); err != nil {
-		errorIf(err, "Invalid queue configs found.")
-		return ErrOverlappingConfigs
+	// Validate if there are any duplicate counts.
+	for _, count := range configMaps {
+		if count != 1 {
+			return ErrOverlappingConfigs
+		}
+	}
+
+	// Success.
+	return ErrNone
+}
+
+// Check all the topic configs for any duplicates.
+func checkDuplicateTopicConfigs(configs []topicConfig) APIErrorCode {
+	configMaps := make(map[string]int)
+
+	// Navigate through each configs and count the entries.
+	for _, config := range configs {
+		configMaps[config.TopicARN]++
+	}
+
+	// Validate if there are any duplicate counts.
+	for _, count := range configMaps {
+		if count != 1 {
+			return ErrOverlappingConfigs
+		}
 	}

 	// Success.
@@ -217,25 +314,46 @@ func validateNotificationConfig(nConfig notificationConfig) APIErrorCode {
 	if s3Error := validateQueueConfigs(nConfig.QueueConfigs); s3Error != ErrNone {
 		return s3Error
 	}
+	// Validate all topic configs.
+	if s3Error := validateTopicConfigs(nConfig.TopicConfigs); s3Error != ErrNone {
+		return s3Error
+	}

 	// Check for duplicate queue configs.
-	if len(nConfig.QueueConfigs) > 1 {
-		if s3Error := checkDuplicateQueueConfigs(nConfig.QueueConfigs); s3Error != ErrNone {
-			return s3Error
-		}
+	if s3Error := checkDuplicateQueueConfigs(nConfig.QueueConfigs); s3Error != ErrNone {
+		return s3Error
+	}
+	// Check for duplicate topic configs.
+	if s3Error := checkDuplicateTopicConfigs(nConfig.TopicConfigs); s3Error != ErrNone {
+		return s3Error
 	}

 	// Add validation for other configurations.
 	return ErrNone
 }

+// Unmarshals input value of AWS ARN format into minioTopic object.
+// Returned value represents minio topic type, currently supported are
+// - listen
+func unmarshalTopicARN(topicARN string) arnTopic {
+	topic := arnTopic{}
+	if !strings.HasPrefix(topicARN, minioTopic+serverConfig.GetRegion()+":") {
+		return topic
+	}
+	topicType := strings.TrimPrefix(topicARN, minioTopic+serverConfig.GetRegion()+":")
+	switch {
+	case strings.HasSuffix(topicType, snsTypeMinio):
+		topic.Type = snsTypeMinio
+	} // Add more topic here.
+	topic.AccountID = strings.TrimSuffix(topicType, ":"+topic.Type)
+	return topic
+}
+
 // Unmarshals input value of AWS ARN format into minioSqs object.
 // Returned value represents minio sqs types, currently supported are
 // - amqp
-// - nats
 // - elasticsearch
 // - redis
-// - postgresql
 func unmarshalSqsARN(queueARN string) (mSqs arnSQS) {
 	mSqs = arnSQS{}
 	if !strings.HasPrefix(queueARN, minioSqs+serverConfig.GetRegion()+":") {
@@ -245,14 +363,10 @@ func unmarshalSqsARN(queueARN string) (mSqs arnSQS) {
 	switch {
 	case strings.HasSuffix(sqsType, queueTypeAMQP):
 		mSqs.Type = queueTypeAMQP
-	case strings.HasSuffix(sqsType, queueTypeNATS):
-		mSqs.Type = queueTypeNATS
 	case strings.HasSuffix(sqsType, queueTypeElastic):
 		mSqs.Type = queueTypeElastic
 	case strings.HasSuffix(sqsType, queueTypeRedis):
 		mSqs.Type = queueTypeRedis
-	case strings.HasSuffix(sqsType, queueTypePostgreSQL):
-		mSqs.Type = queueTypePostgreSQL
 	} // Add more queues here.
 	mSqs.AccountID = strings.TrimSuffix(sqsType, ":"+mSqs.Type)
 	return mSqs
@@ -16,126 +16,7 @@

 package cmd

-import (
-	"strings"
-	"testing"
-)
-
-// Test validates for duplicate configs.
-func TestCheckDuplicateConfigs(t *testing.T) {
-	testCases := []struct {
-		qConfigs        []queueConfig
-		expectedErrCode APIErrorCode
-	}{
-		// Error for duplicate queue configs.
-		{
-			qConfigs: []queueConfig{
-				{
-					QueueARN: "arn:minio:sqs:us-east-1:1:redis",
-				},
-				{
-					QueueARN: "arn:minio:sqs:us-east-1:1:redis",
-				},
-			},
-			expectedErrCode: ErrOverlappingConfigs,
-		},
-		// Valid queue configs.
-		{
-			qConfigs: []queueConfig{
-				{
-					QueueARN: "arn:minio:sqs:us-east-1:1:redis",
-				},
-			},
-			expectedErrCode: ErrNone,
-		},
-	}
-
-	// ... validate for duplicate queue configs.
-	for i, testCase := range testCases {
-		errCode := checkDuplicateQueueConfigs(testCase.qConfigs)
-		if errCode != testCase.expectedErrCode {
-			t.Errorf("Test %d: Expected %d, got %d", i+1, testCase.expectedErrCode, errCode)
-		}
-	}
-}
-
-// Tests for validating filter rules.
-func TestCheckFilterRules(t *testing.T) {
-	testCases := []struct {
-		rules           []filterRule
-		expectedErrCode APIErrorCode
-	}{
-		// Valid prefix and suffix values.
-		{
-			rules: []filterRule{
-				{
-					Name:  "prefix",
-					Value: "test/test1",
-				},
-				{
-					Name:  "suffix",
-					Value: ".jpg",
-				},
-			},
-			expectedErrCode: ErrNone,
-		},
-		// Invalid filter name.
-		{
-			rules: []filterRule{
-				{
-					Name:  "unknown",
-					Value: "test/test1",
-				},
-			},
-			expectedErrCode: ErrFilterNameInvalid,
-		},
-		// Cannot have duplicate prefixes.
-		{
-			rules: []filterRule{
-				{
-					Name:  "prefix",
-					Value: "test/test1",
-				},
-				{
-					Name:  "prefix",
-					Value: "test/test1",
-				},
-			},
-			expectedErrCode: ErrFilterNamePrefix,
-		},
-		// Cannot have duplicate suffixes.
-		{
-			rules: []filterRule{
-				{
-					Name:  "suffix",
-					Value: ".jpg",
-				},
-				{
-					Name:  "suffix",
-					Value: ".txt",
-				},
-			},
-			expectedErrCode: ErrFilterNameSuffix,
-		},
-		// Filter value cannot be bigger than > 1024.
-		{
-			rules: []filterRule{
-				{
-					Name:  "prefix",
-					Value: strings.Repeat("a", 1025),
-				},
-			},
-			expectedErrCode: ErrFilterValueInvalid,
-		},
-	}
-
-	for i, testCase := range testCases {
-		errCode := checkFilterRules(testCase.rules)
-		if errCode != testCase.expectedErrCode {
-			t.Errorf("Test %d: Expected %d, got %d", i+1, testCase.expectedErrCode, errCode)
-		}
-	}
-}
+import "testing"

 // Tests filter name validation.
 func TestIsValidFilterName(t *testing.T) {
@@ -216,6 +97,79 @@ func TestValidEvents(t *testing.T) {
 	}
 }

+// Tests topic arn validation.
+func TestTopicARN(t *testing.T) {
+	rootPath, err := newTestConfig("us-east-1")
+	if err != nil {
+		t.Fatalf("unable initialize config file, %s", err)
+	}
+	defer removeAll(rootPath)
+
+	testCases := []struct {
+		topicARN string
+		errCode  APIErrorCode
+	}{
+		// Valid minio topic with '1' account id.
+		{
+			topicARN: "arn:minio:sns:us-east-1:1:minio",
+			errCode:  ErrNone,
+		},
+		// Valid minio topic with '10' account id.
+		{
+			topicARN: "arn:minio:sns:us-east-1:10:minio",
+			errCode:  ErrNone,
+		},
+		// Invalid empty topic  arn.
+		{
+			topicARN: "",
+			errCode:  ErrARNNotification,
+		},
+		// Invalid notification service type.
+		{
+			topicARN: "arn:minio:sqs:us-east-1:1:listen",
+			errCode:  ErrARNNotification,
+		},
+		// Invalid region 'us-west-1' in queue arn.
+		{
+			topicARN: "arn:minio:sns:us-west-1:1:listen",
+			errCode:  ErrRegionNotification,
+		},
+		// Empty topic account id is invalid.
+		{
+			topicARN: "arn:minio:sns:us-east-1::listen",
+			errCode:  ErrARNNotification,
+		},
+		// Empty topic account name is invalid.
+		{
+			topicARN: "arn:minio:sns:us-east-1:10:",
+			errCode:  ErrARNNotification,
+		},
+		// Empty topic account id and account name is invalid.
+		{
+			topicARN: "arn:minio:sns:us-east-1::",
+			errCode:  ErrARNNotification,
+		},
+		// Missing topic id and separator missing at the end in topic arn.
+		{
+			topicARN: "arn:minio:sns:us-east-1:listen",
+			errCode:  ErrARNNotification,
+		},
+		// Missing topic id and empty string at the end in topic arn.
+		{
+			topicARN: "arn:minio:sns:us-east-1:",
+			errCode:  ErrARNNotification,
+		},
+	}
+
+	// Validate all topics.
+	for i, testCase := range testCases {
+		errCode := checkTopicARN(testCase.topicARN)
+		if testCase.errCode != errCode {
+			t.Errorf("Test %d: Expected \"%d\", got \"%d\"", i+1, testCase.errCode, errCode)
+		}
+	}
+}
+
 // Tests queue arn validation.
 func TestQueueARN(t *testing.T) {
 	rootPath, err := newTestConfig("us-east-1")
@@ -294,8 +248,55 @@ func TestQueueARN(t *testing.T) {
 	}
 }

+// Test unmarshal topic arn.
+func TestUnmarshalTopicARN(t *testing.T) {
+	rootPath, err := newTestConfig("us-east-1")
+	if err != nil {
+		t.Fatalf("unable initialize config file, %s", err)
+	}
+	defer removeAll(rootPath)
+
+	testCases := []struct {
+		topicARN string
+		Type     string
+	}{
+		// Valid minio topic arn.
+		{
+			topicARN: "arn:minio:sns:us-east-1:1:listen",
+			Type:     "listen",
+		},
+		// Invalid empty topic arn.
+		{
+			topicARN: "",
+			Type:     "",
+		},
+		// Invalid region 'us-west-1' in topic arn.
+		{
+			topicARN: "arn:minio:sns:us-west-1:1:listen",
+			Type:     "",
+		},
+		// Partial topic arn.
+		{
+			topicARN: "arn:minio:sns:",
+			Type:     "",
+		},
+		// Invalid topic service value.
+		{
+			topicARN: "arn:minio:sns:us-east-1:1:*",
+			Type:     "",
+		},
+	}
+
+	for i, testCase := range testCases {
+		topic := unmarshalTopicARN(testCase.topicARN)
+		if testCase.Type != topic.Type {
+			t.Errorf("Test %d: Expected \"%s\", got \"%s\"", i+1, testCase.Type, topic.Type)
+		}
+	}
+}
+
 // Test unmarshal queue arn.
-func TestUnmarshalSQSARN(t *testing.T) {
+func TestUnmarshalSqsARN(t *testing.T) {
 	rootPath, err := newTestConfig("us-east-1")
 	if err != nil {
 		t.Fatalf("unable initialize config file, %s", err)
@@ -23,14 +23,13 @@ import (
 	"io/ioutil"
 	"net/http"

-	humanize "github.com/dustin/go-humanize"
 	mux "github.com/gorilla/mux"
 	"github.com/minio/minio-go/pkg/set"
 	"github.com/minio/minio/pkg/wildcard"
 )

 // maximum supported access policy size.
-const maxAccessPolicySize = 20 * humanize.KiByte
+const maxAccessPolicySize = 20 * 1024 // 20KiB.

 // Verify if a given action is valid for the url path based on the
 // existing bucket access policy.
@@ -51,10 +50,17 @@ func bucketPolicyEvalStatements(action string, resource string, conditions map[s

 // Verify if action, resource and conditions match input policy statement.
 func bucketPolicyMatchStatement(action string, resource string, conditions map[string]set.StringSet, statement policyStatement) bool {
-	// Verify if action, resource and condition match in given statement.
-	return (bucketPolicyActionMatch(action, statement) &&
-		bucketPolicyResourceMatch(resource, statement) &&
-		bucketPolicyConditionMatch(conditions, statement))
+	// Verify if action matches.
+	if bucketPolicyActionMatch(action, statement) {
+		// Verify if resource matches.
+		if bucketPolicyResourceMatch(resource, statement) {
+			// Verify if condition matches.
+			if bucketPolicyConditionMatch(conditions, statement) {
+				return true
+			}
+		}
+	}
+	return false
 }

 // Verify if given action matches with policy statement.
@@ -120,26 +126,18 @@ func bucketPolicyConditionMatch(conditions map[string]set.StringSet, statement p
 // This implementation of the PUT operation uses the policy
 // subresource to add to or replace a policy on a bucket
 func (api objectAPIHandlers) PutBucketPolicyHandler(w http.ResponseWriter, r *http.Request) {
-	objAPI := api.ObjectAPI()
-	if objAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, "", "", serverConfig.GetRegion()); s3Error != ErrNone {
-		writeErrorResponse(w, r, s3Error, r.URL.Path)
-		return
-	}
-
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]
-
-	// Before proceeding validate if bucket exists.
-	_, err := objAPI.GetBucketInfo(bucket)
-	if err != nil {
-		errorIf(err, "Unable to find bucket info.")
-		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
+	switch getRequestAuthType(r) {
+	default:
+		// For all unknown auth types return error.
+		writeErrorResponse(w, r, ErrAccessDenied, r.URL.Path)
 		return
+	case authTypePresigned, authTypeSigned:
+		if s3Error := isReqAuthenticated(r, serverConfig.GetRegion()); s3Error != ErrNone {
+			writeErrorResponse(w, r, s3Error, r.URL.Path)
+			return
+		}
 	}

 	// If Content-Length is unknown or zero, deny the
@@ -182,7 +180,8 @@ func (api objectAPIHandlers) PutBucketPolicyHandler(w http.ResponseWriter, r *ht
 	}

 	// Save bucket policy.
-	if err = persistAndNotifyBucketPolicyChange(bucket, policyChange{false, policy}, objAPI); err != nil {
+	if err = writeBucketPolicy(bucket, api.ObjectAPI, bytes.NewReader(policyBytes), int64(len(policyBytes))); err != nil {
+		errorIf(err, "Unable to write bucket policy.")
 		switch err.(type) {
 		case BucketNameInvalid:
 			writeErrorResponse(w, r, ErrInvalidBucketName, r.URL.Path)
@@ -192,51 +191,20 @@ func (api objectAPIHandlers) PutBucketPolicyHandler(w http.ResponseWriter, r *ht
 		return
 	}

+	// Set the bucket policy in memory.
+	globalBucketPolicies.SetBucketPolicy(bucket, policy)
+
 	// Success.
 	writeSuccessNoContent(w)
 }

-// persistAndNotifyBucketPolicyChange - takes a policyChange argument,
-// persists it to storage, and notify nodes in the cluster about the
-// change. In-memory state is updated in response to the notification.
-func persistAndNotifyBucketPolicyChange(bucket string, pCh policyChange, objAPI ObjectLayer) error {
-	// Acquire a write lock on bucket before modifying its
-	// configuration.
-	bucketLock := nsMutex.NewNSLock(bucket, "")
-	bucketLock.Lock()
-	// Release lock after notifying peers
-	defer bucketLock.Unlock()
-
-	if pCh.IsRemove {
-		if err := removeBucketPolicy(bucket, objAPI); err != nil {
-			return err
-		}
-	} else {
-		if pCh.BktPolicy == nil {
-			return errInvalidArgument
-		}
-		if err := writeBucketPolicy(bucket, objAPI, pCh.BktPolicy); err != nil {
-			return err
-		}
-	}
-
-	// Notify all peers (including self) to update in-memory state
-	S3PeersUpdateBucketPolicy(bucket, pCh)
-	return nil
-}
-
 // DeleteBucketPolicyHandler - DELETE Bucket policy
 // -----------------
 // This implementation of the DELETE operation uses the policy
 // subresource to add to remove a policy on a bucket.
 func (api objectAPIHandlers) DeleteBucketPolicyHandler(w http.ResponseWriter, r *http.Request) {
-	objAPI := api.ObjectAPI()
-	if objAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, "", "", serverConfig.GetRegion()); s3Error != ErrNone {
+	// DeleteBucketPolicy does not support bucket policies, use checkAuth to validate signature.
+	if s3Error := checkAuth(r); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
@@ -244,18 +212,12 @@ func (api objectAPIHandlers) DeleteBucketPolicyHandler(w http.ResponseWriter, r
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	// Before proceeding validate if bucket exists.
-	_, err := objAPI.GetBucketInfo(bucket)
-	if err != nil {
-		errorIf(err, "Unable to find bucket info.")
-		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
-		return
-	}
-
-	// Delete bucket access policy, by passing an empty policy
-	// struct.
-	if err := persistAndNotifyBucketPolicyChange(bucket, policyChange{true, nil}, objAPI); err != nil {
+	// Delete bucket access policy.
+	if err := removeBucketPolicy(bucket, api.ObjectAPI); err != nil {
+		errorIf(err, "Unable to remove bucket policy.")
 		switch err.(type) {
+		case BucketNameInvalid:
+			writeErrorResponse(w, r, ErrInvalidBucketName, r.URL.Path)
 		case BucketPolicyNotFound:
 			writeErrorResponse(w, r, ErrNoSuchBucketPolicy, r.URL.Path)
 		default:
@@ -264,6 +226,9 @@ func (api objectAPIHandlers) DeleteBucketPolicyHandler(w http.ResponseWriter, r
 		return
 	}

+	// Remove bucket policy.
+	globalBucketPolicies.RemoveBucketPolicy(bucket)
+
 	// Success.
 	writeSuccessNoContent(w)
 }
@@ -273,13 +238,8 @@ func (api objectAPIHandlers) DeleteBucketPolicyHandler(w http.ResponseWriter, r
 // This operation uses the policy
 // subresource to return the policy of a specified bucket.
 func (api objectAPIHandlers) GetBucketPolicyHandler(w http.ResponseWriter, r *http.Request) {
-	objAPI := api.ObjectAPI()
-	if objAPI == nil {
-		writeErrorResponse(w, r, ErrServerNotInitialized, r.URL.Path)
-		return
-	}
-
-	if s3Error := checkRequestAuthType(r, "", "", serverConfig.GetRegion()); s3Error != ErrNone {
+	// GetBucketPolicy does not support bucket policies, use checkAuth to validate signature.
+	if s3Error := checkAuth(r); s3Error != ErrNone {
 		writeErrorResponse(w, r, s3Error, r.URL.Path)
 		return
 	}
@@ -287,19 +247,13 @@ func (api objectAPIHandlers) GetBucketPolicyHandler(w http.ResponseWriter, r *ht
 	vars := mux.Vars(r)
 	bucket := vars["bucket"]

-	// Before proceeding validate if bucket exists.
-	_, err := objAPI.GetBucketInfo(bucket)
-	if err != nil {
-		errorIf(err, "Unable to find bucket info.")
-		writeErrorResponse(w, r, toAPIErrorCode(err), r.URL.Path)
-		return
-	}
-
 	// Read bucket access policy.
-	policy, err := readBucketPolicy(bucket, objAPI)
+	policy, err := readBucketPolicy(bucket, api.ObjectAPI)
 	if err != nil {
 		errorIf(err, "Unable to read bucket policy.")
 		switch err.(type) {
+		case BucketNameInvalid:
+			writeErrorResponse(w, r, ErrInvalidBucketName, r.URL.Path)
 		case BucketPolicyNotFound:
 			writeErrorResponse(w, r, ErrNoSuchBucketPolicy, r.URL.Path)
 		default:
@@ -1,5 +1,5 @@
 /*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
+ * Minio Cloud Storage, (C) 2015, 2016 Minio, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package cmd
 import (
 	"bytes"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -61,7 +60,7 @@ func TestBucketPolicyResourceMatch(t *testing.T) {
 		// Policy with resource ending with bucket/oo* should allow access to bucket/ootput.txt.
 		{generateResource("minio-bucket", "ootput.txt"), generateStatement(fmt.Sprintf("%s%s", AWSResourcePrefix, "minio-bucket"+"/oo*")), true},
 		// Test case - 7.
-		// Policy with resource ending with bucket/oo* allows access to all sub-dirs starting with "oo" inside given bucket.
+		// Policy with resource ending with bucket/oo* allows access to all subfolders starting with "oo" inside given bucket.
 		{generateResource("minio-bucket", "oop-bucket/my-file"), generateStatement(fmt.Sprintf("%s%s", AWSResourcePrefix, "minio-bucket"+"/oo*")), true},
 		// Test case - 8.
 		{generateResource("minio-bucket", "Asia/India/1.pjg"), generateStatement(fmt.Sprintf("%s%s", AWSResourcePrefix, "minio-bucket"+"/Asia/Japan/*")), false},
@@ -242,18 +241,34 @@ func TestBucketPolicyActionMatch(t *testing.T) {

 // Wrapper for calling Put Bucket Policy HTTP handler tests for both XL multiple disks and single node setup.
 func TestPutBucketPolicyHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testPutBucketPolicyHandler, []string{"PutBucketPolicy"})
+	ExecObjectLayerTest(t, testPutBucketPolicyHandler)
 }

 // testPutBucketPolicyHandler - Test for Bucket policy end point.
-func testPutBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
+// TODO: Add exhaustive cases with various combination of statement fields.
+func testPutBucketPolicyHandler(obj ObjectLayer, instanceType string, t TestErrHandler) {
 	initBucketPolicies(obj)

-	bucketName1 := fmt.Sprintf("%s-1", bucketName)
-	if err := obj.MakeBucket(bucketName1); err != nil {
-		t.Fatal(err)
+	// get random bucket name.
+	bucketName := getRandomBucketName()
+	// Create bucket.
+	err := obj.MakeBucket(bucketName)
+	if err != nil {
+		// failed to create newbucket, abort.
+		t.Fatalf("%s : %s", instanceType, err)
 	}
+	// Register the API end points with XL/FS object layer.
+	apiRouter := initTestAPIEndPoints(obj, []string{"PutBucketPolicy"})
+	// initialize the server and obtain the credentials and root.
+	// credentials are necessary to sign the HTTP request.
+	rootPath, err := newTestConfig("us-east-1")
+	if err != nil {
+		t.Fatalf("Init Test config failed")
+	}
+	// remove the root folder after the test ends.
+	defer removeAll(rootPath)
+
+	credentials := serverConfig.GetCredential()

 	// template for constructing HTTP request body for PUT bucket policy.
 	bucketPolicyTemplate := `{"Version":"2012-10-17","Statement":[{"Sid":"","Effect":"Allow","Principal":{"AWS":["*"]},"Action":["s3:GetBucketLocation","s3:ListBucket"],"Resource":["arn:aws:s3:::%s"]},{"Sid":"","Effect":"Allow","Principal":{"AWS":["*"]},"Action":["s3:GetObject"],"Resource":["arn:aws:s3:::%s/this*"]}]}`
@@ -261,203 +276,67 @@ func testPutBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string
 	// test cases with sample input and expected output.
 	testCases := []struct {
 		bucketName string
-		// bucket policy to be set,
-		// set as request body.
-		bucketPolicyReader io.ReadSeeker
-		// length in bytes of the bucket policy being set.
-		policyLen int
-		accessKey string
-		secretKey string
+		accessKey  string
+		secretKey  string
 		// expected Response.
 		expectedRespStatus int
 	}{
-		// Test case - 1.
-		{
-			bucketName:         bucketName,
-			bucketPolicyReader: bytes.NewReader([]byte(fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName))),
-
-			policyLen:          len(fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName)),
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNoContent,
-		},
-		// Test case - 2.
-		// Setting the content length to be more than max allowed size.
-		// Expecting StatusBadRequest (400).
-		{
-			bucketName:         bucketName,
-			bucketPolicyReader: bytes.NewReader([]byte(fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName))),
-
-			policyLen:          maxAccessPolicySize + 1,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusBadRequest,
-		},
-		// Test case - 3.
-		// Case with content-length of the HTTP request set to 0.
-		// Expecting the HTTP response status to be StatusLengthRequired (411).
-		{
-			bucketName:         bucketName,
-			bucketPolicyReader: bytes.NewReader([]byte(fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName))),
-
-			policyLen:          0,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusLengthRequired,
-		},
-		// Test case - 4.
-		// setting the readSeeker to `nil`, bucket policy parser will fail.
-		{
-			bucketName:         bucketName,
-			bucketPolicyReader: nil,
-
-			policyLen:          10,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusBadRequest,
-		},
-		// Test case - 5.
-		// setting the keys to be empty.
-		// Expecting statusForbidden.
-		{
-			bucketName:         bucketName,
-			bucketPolicyReader: nil,
-
-			policyLen:          10,
-			accessKey:          "",
-			secretKey:          "",
-			expectedRespStatus: http.StatusForbidden,
-		},
-		// Test case - 6.
-		// setting an invalid bucket policy.
-		// the bucket policy parser will fail.
-		{
-			bucketName:         bucketName,
-			bucketPolicyReader: bytes.NewReader([]byte("dummy-policy")),
-
-			policyLen:          len([]byte("dummy-policy")),
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusBadRequest,
-		},
-		// Test case - 7.
-		// Different bucket name used in the HTTP request and the policy string.
-		// checkBucketPolicyResources should fail.
-		{
-			bucketName:         bucketName1,
-			bucketPolicyReader: bytes.NewReader([]byte(fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName))),
-
-			policyLen:          len(fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName)),
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusBadRequest,
-		},
-		// Test case - 8.
-		// non-existent bucket is used.
-		// writing BucketPolicy should fail.
-		// should result is 500 InternalServerError.
-		{
-			bucketName:         "non-existent-bucket",
-			bucketPolicyReader: bytes.NewReader([]byte(fmt.Sprintf(bucketPolicyTemplate, "non-existent-bucket", "non-existent-bucket"))),
-
-			policyLen:          len(fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName)),
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNotFound,
-		},
-		// Test case - 9.
-		// invalid bucket name is used.
-		// writing BucketPolicy should fail.
-		// should result is 400 StatusBadRequest.
-		{
-			bucketName:         ".invalid-bucket",
-			bucketPolicyReader: bytes.NewReader([]byte(fmt.Sprintf(bucketPolicyTemplate, ".invalid-bucket", ".invalid-bucket"))),
-
-			policyLen:          len(fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName)),
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusBadRequest,
-		},
+		{bucketName, credentials.AccessKeyID, credentials.SecretAccessKey, http.StatusNoContent},
 	}

 	// Iterating over the test cases, calling the function under test and asserting the response.
 	for i, testCase := range testCases {
 		// obtain the put bucket policy request body.
+		bucketPolicyStr := fmt.Sprintf(bucketPolicyTemplate, testCase.bucketName, testCase.bucketName)
 		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV4 := httptest.NewRecorder()
+		rec := httptest.NewRecorder()
 		// construct HTTP request for PUT bucket policy endpoint.
-		reqV4, err := newTestSignedRequestV4("PUT", getPutPolicyURL("", testCase.bucketName),
-			int64(testCase.policyLen), testCase.bucketPolicyReader, testCase.accessKey, testCase.secretKey)
+		req, err := newTestSignedRequest("PUT", getPutPolicyURL("", testCase.bucketName),
+			int64(len(bucketPolicyStr)), bytes.NewReader([]byte(bucketPolicyStr)), testCase.accessKey, testCase.secretKey)
 		if err != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, instanceType, err)
+			t.Fatalf("Test %d: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, err)
 		}
 		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic ofthe handler.
 		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV4, reqV4)
-		if recV4.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, recV4.Code)
-		}
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for PUT bucket policy endpoint.
-		reqV2, err := newTestSignedRequestV2("PUT", getPutPolicyURL("", testCase.bucketName),
-			int64(testCase.policyLen), testCase.bucketPolicyReader, testCase.accessKey, testCase.secretKey)
-		if err != nil {
-			t.Fatalf("Test %d: %s: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, instanceType, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic ofthe handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		if recV2.Code != testCase.expectedRespStatus {
-			t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, recV2.Code)
+		apiRouter.ServeHTTP(rec, req)
+		if rec.Code != testCase.expectedRespStatus {
+			t.Errorf("Test %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testCase.expectedRespStatus, rec.Code)
 		}
 	}
-
-	// Test for Anonymous/unsigned http request.
-	// Bucket policy related functions doesn't support anonymous requests, setting policies shouldn't make a difference.
-	bucketPolicyStr := fmt.Sprintf(bucketPolicyTemplate, bucketName, bucketName)
-	// create unsigned HTTP request for PutBucketPolicyHandler.
-	anonReq, err := newTestRequest("PUT", getPutPolicyURL("", bucketName),
-		int64(len(bucketPolicyStr)), bytes.NewReader([]byte(bucketPolicyStr)))
-
-	if err != nil {
-		t.Fatalf("Minio %s: Failed to create an anonymous request for bucket \"%s\": <ERROR> %v",
-			instanceType, bucketName, err)
-	}
-
-	// ExecObjectLayerAPIAnonTest - Calls the HTTP API handler using the anonymous request, validates the ErrAccessDeniedResponse,
-	// sets the bucket policy using the policy statement generated from `getWriteOnlyObjectStatement` so that the
-	// unsigned request goes through and its validated again.
-	ExecObjectLayerAPIAnonTest(t, "PutBucketPolicyHandler", bucketName, "", instanceType, apiRouter, anonReq, getWriteOnlyObjectStatement)
-
-	// HTTP request for testing when `objectLayer` is set to `nil`.
-	// There is no need to use an existing bucket and valid input for creating the request
-	// since the `objectLayer==nil`  check is performed before any other checks inside the handlers.
-	// The only aim is to generate an HTTP request in a way that the relevant/registered end point is evoked/called.
-	nilBucket := "dummy-bucket"
-
-	nilReq, err := newTestSignedRequestV4("PUT", getPutPolicyURL("", nilBucket),
-		0, nil, "", "")
-
-	if err != nil {
-		t.Errorf("Minio %s: Failed to create HTTP request for testing the response when object Layer is set to `nil`.", instanceType)
-	}
-	// execute the object layer set to `nil` test.
-	// `ExecObjectLayerAPINilTest` manages the operation.
-	ExecObjectLayerAPINilTest(t, nilBucket, "", instanceType, apiRouter, nilReq)
 }

 // Wrapper for calling Get Bucket Policy HTTP handler tests for both XL multiple disks and single node setup.
 func TestGetBucketPolicyHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testGetBucketPolicyHandler, []string{"PutBucketPolicy", "GetBucketPolicy"})
+	ExecObjectLayerTest(t, testGetBucketPolicyHandler)
 }

 // testGetBucketPolicyHandler - Test for end point which fetches the access policy json of the given bucket.
-func testGetBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	// initialize bucket policy.
+// TODO: Add exhaustive cases with various combination of statement fields.
+func testGetBucketPolicyHandler(obj ObjectLayer, instanceType string, t TestErrHandler) {
 	initBucketPolicies(obj)

+	// get random bucket name.
+	bucketName := getRandomBucketName()
+	// Create bucket.
+	err := obj.MakeBucket(bucketName)
+	if err != nil {
+		// failed to create newbucket, abort.
+		t.Fatalf("%s : %s", instanceType, err)
+	}
+	// Register the API end points with XL/FS object layer.
+	// Registering only the PutBucketPolicy and GetBucketPolicy handlers.
+	apiRouter := initTestAPIEndPoints(obj, []string{"PutBucketPolicy", "GetBucketPolicy"})
+	// initialize the server and obtain the credentials and root.
+	// credentials are necessary to sign the HTTP request.
+	rootPath, err := newTestConfig("us-east-1")
+	if err != nil {
+		t.Fatalf("Init Test config failed")
+	}
+	// remove the root folder after the test ends.
+	defer removeAll(rootPath)
+
+	credentials := serverConfig.GetCredential()
+
 	// template for constructing HTTP request body for PUT bucket policy.
 	bucketPolicyTemplate := `{"Version":"2012-10-17","Statement":[{"Action":["s3:GetBucketLocation","s3:ListBucket"],"Effect":"Allow","Principal":{"AWS":["*"]},"Resource":["arn:aws:s3:::%s"],"Sid":""},{"Action":["s3:GetObject"],"Effect":"Allow","Principal":{"AWS":["*"]},"Resource":["arn:aws:s3:::%s/this*"],"Sid":""}]}`

@@ -478,32 +357,18 @@ func testGetBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string
 		// obtain the put bucket policy request body.
 		bucketPolicyStr := fmt.Sprintf(bucketPolicyTemplate, testPolicy.bucketName, testPolicy.bucketName)
 		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV4 := httptest.NewRecorder()
+		rec := httptest.NewRecorder()
 		// construct HTTP request for PUT bucket policy endpoint.
-		reqV4, err := newTestSignedRequestV4("PUT", getPutPolicyURL("", testPolicy.bucketName),
+		req, err := newTestSignedRequest("PUT", getPutPolicyURL("", testPolicy.bucketName),
 			int64(len(bucketPolicyStr)), bytes.NewReader([]byte(bucketPolicyStr)), testPolicy.accessKey, testPolicy.secretKey)
 		if err != nil {
 			t.Fatalf("Test %d: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, err)
 		}
 		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic ofthe handler.
 		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV4, reqV4)
-		if recV4.Code != testPolicy.expectedRespStatus {
-			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testPolicy.expectedRespStatus, recV4.Code)
-		}
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for PUT bucket policy endpoint.
-		reqV2, err := newTestSignedRequestV2("PUT", getPutPolicyURL("", testPolicy.bucketName),
-			int64(len(bucketPolicyStr)), bytes.NewReader([]byte(bucketPolicyStr)), testPolicy.accessKey, testPolicy.secretKey)
-		if err != nil {
-			t.Fatalf("Test %d: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic ofthe handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		if recV2.Code != testPolicy.expectedRespStatus {
-			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testPolicy.expectedRespStatus, recV2.Code)
+		apiRouter.ServeHTTP(rec, req)
+		if rec.Code != testPolicy.expectedRespStatus {
+			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testPolicy.expectedRespStatus, rec.Code)
 		}
 	}

@@ -516,42 +381,16 @@ func testGetBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string
 		expectedBucketPolicy string
 		expectedRespStatus   int
 	}{
-		// Test case - 1.
-		// Case which valid inputs, expected to return success status of 200OK.
-		{
-			bucketName:           bucketName,
-			accessKey:            credentials.AccessKeyID,
-			secretKey:            credentials.SecretAccessKey,
-			expectedBucketPolicy: bucketPolicyTemplate,
-			expectedRespStatus:   http.StatusOK,
-		},
-		// Test case - 2.
-		// Case with non-existent bucket name.
-		{
-			bucketName:           "non-existent-bucket",
-			accessKey:            credentials.AccessKeyID,
-			secretKey:            credentials.SecretAccessKey,
-			expectedBucketPolicy: bucketPolicyTemplate,
-			expectedRespStatus:   http.StatusNotFound,
-		},
-		// Test case - 3.
-		// Case with invalid bucket name.
-		{
-			bucketName:           ".invalid-bucket-name",
-			accessKey:            credentials.AccessKeyID,
-			secretKey:            credentials.SecretAccessKey,
-			expectedBucketPolicy: "",
-			expectedRespStatus:   http.StatusBadRequest,
-		},
+		{bucketName, credentials.AccessKeyID, credentials.SecretAccessKey, bucketPolicyTemplate, http.StatusOK},
 	}
 	// Iterating over the cases, fetching the policy and validating the response.
 	for i, testCase := range testCases {
 		// expected bucket policy json string.
 		expectedBucketPolicyStr := fmt.Sprintf(testCase.expectedBucketPolicy, testCase.bucketName, testCase.bucketName)
 		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV4 := httptest.NewRecorder()
+		rec := httptest.NewRecorder()
 		// construct HTTP request for PUT bucket policy endpoint.
-		reqV4, err := newTestSignedRequestV4("GET", getGetPolicyURL("", testCase.bucketName),
+		req, err := newTestSignedRequest("GET", getGetPolicyURL("", testCase.bucketName),
 			0, nil, testCase.accessKey, testCase.secretKey)

 		if err != nil {
@@ -559,94 +398,57 @@ func testGetBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string
 		}
 		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
 		// Call the ServeHTTP to execute the handler, GetBucketPolicyHandler handles the request.
-		apiRouter.ServeHTTP(recV4, reqV4)
+		apiRouter.ServeHTTP(rec, req)
 		// Assert the response code with the expected status.
-		if recV4.Code != testCase.expectedRespStatus {
-			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testCase.expectedRespStatus, recV4.Code)
+		if rec.Code != testCase.expectedRespStatus {
+			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testCase.expectedRespStatus, rec.Code)
 		}
 		// read the response body.
-		bucketPolicyReadBuf, err := ioutil.ReadAll(recV4.Body)
+		bucketPolicyReadBuf, err := ioutil.ReadAll(rec.Body)
 		if err != nil {
 			t.Fatalf("Test %d: %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err)
 		}
-
-		if recV4.Code != testCase.expectedRespStatus {
-			// Verify whether the bucket policy fetched is same as the one inserted.
-			if expectedBucketPolicyStr != string(bucketPolicyReadBuf) {
-				t.Errorf("Test %d: %s: Bucket policy differs from expected value.", i+1, instanceType)
-			}
-		}
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for PUT bucket policy endpoint.
-		reqV2, err := newTestSignedRequestV2("GET", getGetPolicyURL("", testCase.bucketName),
-			0, nil, testCase.accessKey, testCase.secretKey)
-		if err != nil {
-			t.Fatalf("Test %d: Failed to create HTTP request for GetBucketPolicyHandler: <ERROR> %v", i+1, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler, GetBucketPolicyHandler handles the request.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		// Assert the response code with the expected status.
-		if recV2.Code != testCase.expectedRespStatus {
-			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testCase.expectedRespStatus, recV2.Code)
-		}
-		// read the response body.
-		bucketPolicyReadBuf, err = ioutil.ReadAll(recV2.Body)
-		if err != nil {
-			t.Fatalf("Test %d: %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err)
-		}
-		if recV2.Code == http.StatusOK {
-			// Verify whether the bucket policy fetched is same as the one inserted.
-			if expectedBucketPolicyStr != string(bucketPolicyReadBuf) {
-				t.Errorf("Test %d: %s: Bucket policy differs from expected value.", i+1, instanceType)
-			}
+		// Verify whether the bucket policy fetched is same as the one inserted.
+		if expectedBucketPolicyStr != string(bucketPolicyReadBuf) {
+			t.Errorf("Test %d: %s: Bucket policy differs from expected value.", i+1, instanceType)
 		}
 	}
-
-	// Test for Anonymous/unsigned http request.
-	// Bucket policy related functions doesn't support anonymous requests, setting policies shouldn't make a difference.
-	// create unsigned HTTP request for PutBucketPolicyHandler.
-	anonReq, err := newTestRequest("GET", getPutPolicyURL("", bucketName), 0, nil)
-
-	if err != nil {
-		t.Fatalf("Minio %s: Failed to create an anonymous request for bucket \"%s\": <ERROR> %v",
-			instanceType, bucketName, err)
-	}
-
-	// ExecObjectLayerAPIAnonTest - Calls the HTTP API handler using the anonymous request, validates the ErrAccessDeniedResponse,
-	// sets the bucket policy using the policy statement generated from `getWriteOnlyObjectStatement` so that the
-	// unsigned request goes through and its validated again.
-	ExecObjectLayerAPIAnonTest(t, "GetBucketPolicyHandler", bucketName, "", instanceType, apiRouter, anonReq, getReadOnlyObjectStatement)
-
-	// HTTP request for testing when `objectLayer` is set to `nil`.
-	// There is no need to use an existing bucket and valid input for creating the request
-	// since the `objectLayer==nil`  check is performed before any other checks inside the handlers.
-	// The only aim is to generate an HTTP request in a way that the relevant/registered end point is evoked/called.
-	nilBucket := "dummy-bucket"
-
-	nilReq, err := newTestSignedRequestV4("GET", getGetPolicyURL("", nilBucket),
-		0, nil, "", "")
-
-	if err != nil {
-		t.Errorf("Minio %s: Failed to create HTTP request for testing the response when object Layer is set to `nil`.", instanceType)
-	}
-	// execute the object layer set to `nil` test.
-	// `ExecObjectLayerAPINilTest` manages the operation.
-	ExecObjectLayerAPINilTest(t, nilBucket, "", instanceType, apiRouter, nilReq)
 }

 // Wrapper for calling Delete Bucket Policy HTTP handler tests for both XL multiple disks and single node setup.
 func TestDeleteBucketPolicyHandler(t *testing.T) {
-	ExecObjectLayerAPITest(t, testDeleteBucketPolicyHandler, []string{"PutBucketPolicy", "DeleteBucketPolicy"})
+	ExecObjectLayerTest(t, testDeleteBucketPolicyHandler)
 }

 // testDeleteBucketPolicyHandler - Test for Delete bucket policy end point.
-func testDeleteBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
-	credentials credential, t *testing.T) {
-	// initialize bucket policy.
+// TODO: Add exhaustive cases with various combination of statement fields.
+func testDeleteBucketPolicyHandler(obj ObjectLayer, instanceType string, t TestErrHandler) {
 	initBucketPolicies(obj)

+	// get random bucket name.
+	bucketName := getRandomBucketName()
+	// Create bucket.
+	err := obj.MakeBucket(bucketName)
+	if err != nil {
+		// failed to create newbucket, abort.
+		t.Fatalf("%s : %s", instanceType, err)
+	}
+
+	// Register the API end points with XL/FS object layer.
+	// Registering PutBucketPolicy and DeleteBucketPolicy handlers.
+	apiRouter := initTestAPIEndPoints(obj, []string{"PutBucketPolicy", "DeleteBucketPolicy"})
+
+	// initialize the server and obtain the credentials and root.
+	// credentials are necessary to sign the HTTP request.
+	rootPath, err := newTestConfig("us-east-1")
+	if err != nil {
+		t.Fatalf("Init Test config failed")
+	}
+	// remove the root folder after the test ends.
+	defer removeAll(rootPath)
+
+	credentials := serverConfig.GetCredential()
+
 	// template for constructing HTTP request body for PUT bucket policy.
 	bucketPolicyTemplate := `{
    "Version": "2012-10-17",
@@ -691,12 +493,7 @@ func testDeleteBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName str
 		// expected Response.
 		expectedRespStatus int
 	}{
-		{
-			bucketName:         bucketName,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNoContent,
-		},
+		{bucketName, credentials.AccessKeyID, credentials.SecretAccessKey, http.StatusNoContent},
 	}

 	// Iterating over the cases and writing the bucket policy.
@@ -705,252 +502,48 @@ func testDeleteBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName str
 		// obtain the put bucket policy request body.
 		bucketPolicyStr := fmt.Sprintf(bucketPolicyTemplate, testPolicy.bucketName, testPolicy.bucketName)
 		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV4 := httptest.NewRecorder()
+		rec := httptest.NewRecorder()
 		// construct HTTP request for PUT bucket policy endpoint.
-		reqV4, err := newTestSignedRequestV4("PUT", getPutPolicyURL("", testPolicy.bucketName),
+		req, err := newTestSignedRequest("PUT", getPutPolicyURL("", testPolicy.bucketName),
 			int64(len(bucketPolicyStr)), bytes.NewReader([]byte(bucketPolicyStr)), testPolicy.accessKey, testPolicy.secretKey)
 		if err != nil {
 			t.Fatalf("Test %d: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, err)
 		}
 		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
 		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV4, reqV4)
-		if recV4.Code != testPolicy.expectedRespStatus {
-			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testPolicy.expectedRespStatus, recV4.Code)
+		apiRouter.ServeHTTP(rec, req)
+		if rec.Code != testPolicy.expectedRespStatus {
+			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testPolicy.expectedRespStatus, rec.Code)
 		}
 	}
-
 	// testcases with input and expected output for DeleteBucketPolicyHandler.
 	testCases := []struct {
 		bucketName string
 		accessKey  string
 		secretKey  string
-		// expected response.
+		// expected Response.
 		expectedRespStatus int
 	}{
-		// Test case - 1.
-		{
-			bucketName:         bucketName,
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNoContent,
-		},
-		// Test case - 2.
-		// Case with non-existent-bucket.
-		{
-			bucketName:         "non-existent-bucket",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusNotFound,
-		},
-		// Test case - 3.
-		// Case with invalid bucket name.
-		{
-			bucketName:         ".invalid-bucket-name",
-			accessKey:          credentials.AccessKeyID,
-			secretKey:          credentials.SecretAccessKey,
-			expectedRespStatus: http.StatusBadRequest,
-		},
+		{bucketName, credentials.AccessKeyID, credentials.SecretAccessKey, http.StatusNoContent},
 	}
 	// Iterating over the cases and deleting the bucket policy and then asserting response.
 	for i, testCase := range testCases {
 		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV4 := httptest.NewRecorder()
+		rec := httptest.NewRecorder()
 		// construct HTTP request for Delete bucket policy endpoint.
-		reqV4, err := newTestSignedRequestV4("DELETE", getDeletePolicyURL("", testCase.bucketName),
+		req, err := newTestSignedRequest("DELETE", getDeletePolicyURL("", testCase.bucketName),
 			0, nil, testCase.accessKey, testCase.secretKey)
+
 		if err != nil {
 			t.Fatalf("Test %d: Failed to create HTTP request for GetBucketPolicyHandler: <ERROR> %v", i+1, err)
 		}
 		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
 		// Call the ServeHTTP to execute the handler, DeleteBucketPolicyHandler  handles the request.
-		apiRouter.ServeHTTP(recV4, reqV4)
+		apiRouter.ServeHTTP(rec, req)
 		// Assert the response code with the expected status.
-		if recV4.Code != testCase.expectedRespStatus {
-			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testCase.expectedRespStatus, recV4.Code)
+		if rec.Code != testCase.expectedRespStatus {
+			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testCase.expectedRespStatus, rec.Code)
 		}
-	}

-	// Iterating over the cases and writing the bucket policy.
-	// its required to write the policies first before running tests on GetBucketPolicy.
-	for i, testPolicy := range putTestPolicies {
-		// obtain the put bucket policy request body.
-		bucketPolicyStr := fmt.Sprintf(bucketPolicyTemplate, testPolicy.bucketName, testPolicy.bucketName)
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for PUT bucket policy endpoint.
-		reqV2, err := newTestSignedRequestV2("PUT", getPutPolicyURL("", testPolicy.bucketName),
-			int64(len(bucketPolicyStr)), bytes.NewReader([]byte(bucketPolicyStr)), testPolicy.accessKey, testPolicy.secretKey)
-		if err != nil {
-			t.Fatalf("Test %d: Failed to create HTTP request for PutBucketPolicyHandler: <ERROR> %v", i+1, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		if recV2.Code != testPolicy.expectedRespStatus {
-			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testPolicy.expectedRespStatus, recV2.Code)
-		}
-	}
-
-	for i, testCase := range testCases {
-		// initialize HTTP NewRecorder, this records any mutations to response writer inside the handler.
-		recV2 := httptest.NewRecorder()
-		// construct HTTP request for Delete bucket policy endpoint.
-		reqV2, err := newTestSignedRequestV2("DELETE", getDeletePolicyURL("", testCase.bucketName),
-			0, nil, testCase.accessKey, testCase.secretKey)
-		if err != nil {
-			t.Fatalf("Test %d: Failed to create HTTP request for GetBucketPolicyHandler: <ERROR> %v", i+1, err)
-		}
-		// Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler.
-		// Call the ServeHTTP to execute the handler, DeleteBucketPolicyHandler  handles the request.
-		apiRouter.ServeHTTP(recV2, reqV2)
-		// Assert the response code with the expected status.
-		if recV2.Code != testCase.expectedRespStatus {
-			t.Fatalf("Case %d: Expected the response status to be `%d`, but instead found `%d`", i+1, testCase.expectedRespStatus, recV2.Code)
-		}
-	}
-	// Test for Anonymous/unsigned http request.
-	// Bucket policy related functions doesn't support anonymous requests, setting policies shouldn't make a difference.
-	// create unsigned HTTP request for PutBucketPolicyHandler.
-	anonReq, err := newTestRequest("DELETE", getPutPolicyURL("", bucketName), 0, nil)
-
-	if err != nil {
-		t.Fatalf("Minio %s: Failed to create an anonymous request for bucket \"%s\": <ERROR> %v",
-			instanceType, bucketName, err)
-	}
-
-	// ExecObjectLayerAPIAnonTest - Calls the HTTP API handler using the anonymous request, validates the ErrAccessDeniedResponse,
-	// sets the bucket policy using the policy statement generated from `getWriteOnlyObjectStatement` so that the
-	// unsigned request goes through and its validated again.
-	ExecObjectLayerAPIAnonTest(t, "DeleteBucketPolicyHandler", bucketName, "", instanceType, apiRouter, anonReq, getReadOnlyObjectStatement)
-
-	// HTTP request for testing when `objectLayer` is set to `nil`.
-	// There is no need to use an existing bucket and valid input for creating the request
-	// since the `objectLayer==nil`  check is performed before any other checks inside the handlers.
-	// The only aim is to generate an HTTP request in a way that the relevant/registered end point is evoked/called.
-	nilBucket := "dummy-bucket"
-
-	nilReq, err := newTestSignedRequestV4("DELETE", getDeletePolicyURL("", nilBucket),
-		0, nil, "", "")
-
-	if err != nil {
-		t.Errorf("Minio %s: Failed to create HTTP request for testing the response when object Layer is set to `nil`.", instanceType)
-	}
-	// execute the object layer set to `nil` test.
-	// `ExecObjectLayerAPINilTest` manages the operation.
-	ExecObjectLayerAPINilTest(t, nilBucket, "", instanceType, apiRouter, nilReq)
-}
-
-// TestBucketPolicyConditionMatch - Tests to validate whether bucket policy conditions match.
-func TestBucketPolicyConditionMatch(t *testing.T) {
-	// obtain the inner map[string]set.StringSet for policyStatement.Conditions .
-	getInnerMap := func(key2, value string) map[string]set.StringSet {
-		innerMap := make(map[string]set.StringSet)
-		innerMap[key2] = set.CreateStringSet(value)
-		return innerMap
-	}
-
-	// obtain policyStatement with Conditions set.
-	getStatementWithCondition := func(key1, key2, value string) policyStatement {
-		innerMap := getInnerMap(key2, value)
-		// to set policyStatment.Conditions .
-		conditions := make(map[string]map[string]set.StringSet)
-		conditions[key1] = innerMap
-		// new policy statement.
-		statement := policyStatement{}
-		// set the condition.
-		statement.Conditions = conditions
-		return statement
-	}
-
-	testCases := []struct {
-		statementCondition policyStatement
-		condition          map[string]set.StringSet
-
-		expectedMatch bool
-	}{
-
-		// Test case - 1.
-		// StringEquals condition matches.
-		{
-
-			statementCondition: getStatementWithCondition("StringEquals", "s3:prefix", "Asia/"),
-			condition:          getInnerMap("prefix", "Asia/"),
-
-			expectedMatch: true,
-		},
-		// Test case - 2.
-		// StringEquals condition doesn't match.
-		{
-
-			statementCondition: getStatementWithCondition("StringEquals", "s3:prefix", "Asia/"),
-			condition:          getInnerMap("prefix", "Africa/"),
-
-			expectedMatch: false,
-		},
-		// Test case - 3.
-		// StringEquals condition matches.
-		{
-
-			statementCondition: getStatementWithCondition("StringEquals", "s3:max-keys", "Asia/"),
-			condition:          getInnerMap("max-keys", "Asia/"),
-
-			expectedMatch: true,
-		},
-		// Test case - 4.
-		// StringEquals condition doesn't match.
-		{
-
-			statementCondition: getStatementWithCondition("StringEquals", "s3:max-keys", "Asia/"),
-			condition:          getInnerMap("max-keys", "Africa/"),
-
-			expectedMatch: false,
-		},
-		// Test case - 5.
-		// StringNotEquals condition matches.
-		{
-
-			statementCondition: getStatementWithCondition("StringNotEquals", "s3:prefix", "Asia/"),
-			condition:          getInnerMap("prefix", "Asia/"),
-
-			expectedMatch: true,
-		},
-		// Test case - 6.
-		// StringNotEquals condition doesn't match.
-		{
-
-			statementCondition: getStatementWithCondition("StringNotEquals", "s3:prefix", "Asia/"),
-			condition:          getInnerMap("prefix", "Africa/"),
-
-			expectedMatch: false,
-		},
-		// Test case - 7.
-		// StringNotEquals condition matches.
-		{
-
-			statementCondition: getStatementWithCondition("StringNotEquals", "s3:max-keys", "Asia/"),
-			condition:          getInnerMap("max-keys", "Asia/"),
-
-			expectedMatch: true,
-		},
-		// Test case - 8.
-		// StringNotEquals condition doesn't match.
-		{
-
-			statementCondition: getStatementWithCondition("StringNotEquals", "s3:max-keys", "Asia/"),
-			condition:          getInnerMap("max-keys", "Africa/"),
-
-			expectedMatch: false,
-		},
-	}
-
-	for i, tc := range testCases {
-		t.Run(fmt.Sprintf("Test case %d: Failed.", i+1), func(t *testing.T) {
-			// call the function under test and assert the result with the expected result.
-			doesMatch := bucketPolicyConditionMatch(tc.condition, tc.statementCondition)
-			if tc.expectedMatch != doesMatch {
-				t.Errorf("Expected the match to be `%v`; got `%v`.", tc.expectedMatch, doesMatch)
-			}
-		})
 	}
 }
@@ -74,10 +74,8 @@ func migrateBucketPolicyConfig(objAPI ObjectLayer) error {
 		policyBytes, err := ioutil.ReadFile(policyPath)
 		fatalIf(err, "Unable to read bucket policy to migrate bucket policy", policyPath)
 		newPolicyPath := retainSlash(bucketConfigPrefix) + retainSlash(bucketName) + policyJSON
-		var metadata map[string]string
-		sha256sum := ""
 		// Erasure code the policy config to all the disks.
-		_, err = objAPI.PutObject(minioMetaBucket, newPolicyPath, int64(len(policyBytes)), bytes.NewReader(policyBytes), metadata, sha256sum)
+		_, err = objAPI.PutObject(minioMetaBucket, newPolicyPath, int64(len(policyBytes)), bytes.NewReader(policyBytes), nil)
 		fatalIf(err, "Unable to write bucket policy during migration.", newPolicyPath)
 		return nil
 	}
@@ -23,6 +23,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"path"
 	"sort"
 	"strings"

@@ -35,7 +36,7 @@ const (
 )

 // supportedActionMap - lists all the actions supported by minio.
-var supportedActionMap = set.CreateStringSet("*", "s3:*", "s3:GetObject",
+var supportedActionMap = set.CreateStringSet("*", "*", "s3:*", "s3:GetObject",
 	"s3:ListBucket", "s3:PutObject", "s3:GetBucketLocation", "s3:DeleteObject",
 	"s3:AbortMultipartUpload", "s3:ListBucketMultipartUploads", "s3:ListMultipartUploadParts")

@@ -49,12 +50,18 @@ var supportedConditionsKey = set.CreateStringSet("s3:prefix", "s3:max-keys")
 // supportedEffectMap - supported effects.
 var supportedEffectMap = set.CreateStringSet("Allow", "Deny")

+// policyUser - canonical users list.
+type policyUser struct {
+	AWS           set.StringSet `json:"AWS,omitempty"`
+	CanonicalUser set.StringSet `json:"CanonicalUser,omitempty"`
+}
+
 // Statement - minio policy statement
 type policyStatement struct {
 	Actions    set.StringSet                       `json:"Action"`
 	Conditions map[string]map[string]set.StringSet `json:"Condition,omitempty"`
 	Effect     string
-	Principal  interface{}   `json:"Principal"`
+	Principal  policyUser    `json:"Principal"`
 	Resources  set.StringSet `json:"Resource"`
 	Sid        string
 }
@@ -69,7 +76,7 @@ type bucketPolicy struct {
 func (b bucketPolicy) String() string {
 	bbytes, err := json.Marshal(&b)
 	if err != nil {
-		errorIf(err, "Unable to marshal bucket policy into JSON %#v", b)
+		errorIf(err, "Unable to unmarshal bucket policy into JSON %#v", b)
 		return ""
 	}
 	return string(bbytes)
@@ -79,11 +86,11 @@ func (b bucketPolicy) String() string {
 func isValidActions(actions set.StringSet) (err error) {
 	// Statement actions cannot be empty.
 	if len(actions) == 0 {
-		err = errors.New("Action list cannot be empty")
+		err = errors.New("Action list cannot be empty.")
 		return err
 	}
 	if unsupportedActions := actions.Difference(supportedActionMap); !unsupportedActions.IsEmpty() {
-		err = fmt.Errorf("Unsupported actions found: ‘%#v’, please validate your policy document", unsupportedActions)
+		err = fmt.Errorf("Unsupported actions found: ‘%#v’, please validate your policy document.", unsupportedActions)
 		return err
 	}
 	return nil
@@ -93,11 +100,11 @@ func isValidActions(actions set.StringSet) (err error) {
 func isValidEffect(effect string) (err error) {
 	// Statement effect cannot be empty.
 	if effect == "" {
-		err = errors.New("Policy effect cannot be empty")
+		err = errors.New("Policy effect cannot be empty.")
 		return err
 	}
 	if !supportedEffectMap.Contains(effect) {
-		err = errors.New("Unsupported Effect found: ‘" + effect + "’, please validate your policy document")
+		err = errors.New("Unsupported Effect found: ‘" + effect + "’, please validate your policy document.")
 		return err
 	}
 	return nil
@@ -107,77 +114,34 @@ func isValidEffect(effect string) (err error) {
 func isValidResources(resources set.StringSet) (err error) {
 	// Statement resources cannot be empty.
 	if len(resources) == 0 {
-		err = errors.New("Resource list cannot be empty")
+		err = errors.New("Resource list cannot be empty.")
 		return err
 	}
 	for resource := range resources {
 		if !strings.HasPrefix(resource, AWSResourcePrefix) {
-			err = errors.New("Unsupported resource style found: ‘" + resource + "’, please validate your policy document")
+			err = errors.New("Unsupported resource style found: ‘" + resource + "’, please validate your policy document.")
 			return err
 		}
 		resourceSuffix := strings.SplitAfter(resource, AWSResourcePrefix)[1]
 		if len(resourceSuffix) == 0 || strings.HasPrefix(resourceSuffix, "/") {
-			err = errors.New("Invalid resource style found: ‘" + resource + "’, please validate your policy document")
+			err = errors.New("Invalid resource style found: ‘" + resource + "’, please validate your policy document.")
 			return err
 		}
 	}
 	return nil
 }

-// Parse principals parses a incoming json. Handles cases for
-// these three combinations.
-// - "Principal": "*",
-// - "Principal": { "AWS" : "*" }
-// - "Principal": { "AWS" : [ "*" ]}
-func parsePrincipals(principal interface{}) set.StringSet {
-	principals, ok := principal.(map[string]interface{})
-	if !ok {
-		var principalStr string
-		principalStr, ok = principal.(string)
-		if ok {
-			return set.CreateStringSet(principalStr)
-		}
-	} // else {
-	var principalStrs []string
-	for _, p := range principals {
-		principalStr, isStr := p.(string)
-		if !isStr {
-			principalsAdd, isInterface := p.([]interface{})
-			if !isInterface {
-				principalStrsAddr, isStrs := p.([]string)
-				if !isStrs {
-					continue
-				}
-				principalStrs = append(principalStrs, principalStrsAddr...)
-			} else {
-				for _, pa := range principalsAdd {
-					var pstr string
-					pstr, isStr = pa.(string)
-					if !isStr {
-						continue
-					}
-					principalStrs = append(principalStrs, pstr)
-				}
-			}
-			continue
-		} // else {
-		principalStrs = append(principalStrs, principalStr)
-	}
-	return set.CreateStringSet(principalStrs...)
-}
-
 // isValidPrincipals - are valid principals.
-func isValidPrincipals(principal interface{}) (err error) {
-	principals := parsePrincipals(principal)
+func isValidPrincipals(principals set.StringSet) (err error) {
 	// Statement principal should have a value.
 	if len(principals) == 0 {
-		err = errors.New("Principal cannot be empty")
+		err = errors.New("Principal cannot be empty.")
 		return err
 	}
 	if unsuppPrincipals := principals.Difference(set.CreateStringSet([]string{"*"}...)); !unsuppPrincipals.IsEmpty() {
 		// Minio does not support or implement IAM, "*" is the only valid value.
 		// Amazon s3 doc on principals: http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements.html#Principal
-		err = fmt.Errorf("Unsupported principals found: ‘%#v’, please validate your policy document", unsuppPrincipals)
+		err = fmt.Errorf("Unsupported principals found: ‘%#v’, please validate your policy document.", unsuppPrincipals)
 		return err
 	}
 	return nil
@@ -191,17 +155,17 @@ func isValidConditions(conditions map[string]map[string]set.StringSet) (err erro
 	conditionKeyVal := make(map[string]set.StringSet)
 	for conditionType := range conditions {
 		if !supportedConditionsType.Contains(conditionType) {
-			err = fmt.Errorf("Unsupported condition type '%s', please validate your policy document", conditionType)
+			err = fmt.Errorf("Unsupported condition type '%s', please validate your policy document.", conditionType)
 			return err
 		}
 		for key, value := range conditions[conditionType] {
 			if !supportedConditionsKey.Contains(key) {
-				err = fmt.Errorf("Unsupported condition key '%s', please validate your policy document", conditionType)
+				err = fmt.Errorf("Unsupported condition key '%s', please validate your policy document.", conditionType)
 				return err
 			}
 			conditionVal, ok := conditionKeyVal[key]
 			if ok && !value.Intersection(conditionVal).IsEmpty() {
-				err = fmt.Errorf("Ambigious condition values for key '%s', please validate your policy document", key)
+				err = fmt.Errorf("Ambigious condition values for key '%s', please validate your policy document.", key)
 				return err
 			}
 			conditionKeyVal[key] = value
@@ -223,7 +187,7 @@ func resourcePrefix(resource string) string {
 	if strings.HasSuffix(resource, "*") {
 		resource = strings.TrimSuffix(resource, "*")
 	}
-	return resource
+	return path.Clean(resource)
 }

 // checkBucketPolicyResources validates Resources in unmarshalled bucket policy structure.
@@ -293,13 +257,13 @@ func parseBucketPolicy(bucketPolicyReader io.Reader, policy *bucketPolicy) (err

 	// Policy version cannot be empty.
 	if len(policy.Version) == 0 {
-		err = errors.New("Policy version cannot be empty")
+		err = errors.New("Policy version cannot be empty.")
 		return err
 	}

 	// Policy statements cannot be empty.
 	if len(policy.Statements) == 0 {
-		err = errors.New("Policy statement cannot be empty")
+		err = errors.New("Policy statement cannot be empty.")
 		return err
 	}

@@ -310,7 +274,7 @@ func parseBucketPolicy(bucketPolicyReader io.Reader, policy *bucketPolicy) (err
 			return err
 		}
 		// Statement principal should be supported format.
-		if err := isValidPrincipals(statement.Principal); err != nil {
+		if err := isValidPrincipals(statement.Principal.AWS); err != nil {
 			return err
 		}
 		// Statement actions should be valid.
@@ -76,9 +76,7 @@ var (
 func getReadWriteObjectStatement(bucketName, objectPrefix string) policyStatement {
 	objectResourceStatement := policyStatement{}
 	objectResourceStatement.Effect = "Allow"
-	objectResourceStatement.Principal = map[string]interface{}{
-		"AWS": "*",
-	}
+	objectResourceStatement.Principal.AWS = set.CreateStringSet([]string{"*"}...)
 	objectResourceStatement.Resources = set.CreateStringSet([]string{fmt.Sprintf("%s%s", AWSResourcePrefix, bucketName+"/"+objectPrefix+"*")}...)
 	objectResourceStatement.Actions = set.CreateStringSet(readWriteObjectActions...)
 	return objectResourceStatement
@@ -88,9 +86,7 @@ func getReadWriteObjectStatement(bucketName, objectPrefix string) policyStatemen
 func getReadWriteBucketStatement(bucketName, objectPrefix string) policyStatement {
 	bucketResourceStatement := policyStatement{}
 	bucketResourceStatement.Effect = "Allow"
-	bucketResourceStatement.Principal = map[string]interface{}{
-		"AWS": "*",
-	}
+	bucketResourceStatement.Principal.AWS = set.CreateStringSet([]string{"*"}...)
 	bucketResourceStatement.Resources = set.CreateStringSet([]string{fmt.Sprintf("%s%s", AWSResourcePrefix, bucketName)}...)
 	bucketResourceStatement.Actions = set.CreateStringSet(readWriteBucketActions...)
 	return bucketResourceStatement
@@ -108,9 +104,7 @@ func getReadWriteStatement(bucketName, objectPrefix string) []policyStatement {
 func getReadOnlyBucketStatement(bucketName, objectPrefix string) policyStatement {
 	bucketResourceStatement := policyStatement{}
 	bucketResourceStatement.Effect = "Allow"
-	bucketResourceStatement.Principal = map[string]interface{}{
-		"AWS": "*",
-	}
+	bucketResourceStatement.Principal.AWS = set.CreateStringSet([]string{"*"}...)
 	bucketResourceStatement.Resources = set.CreateStringSet([]string{fmt.Sprintf("%s%s", AWSResourcePrefix, bucketName)}...)
 	bucketResourceStatement.Actions = set.CreateStringSet(readOnlyBucketActions...)
 	return bucketResourceStatement
@@ -120,9 +114,7 @@ func getReadOnlyBucketStatement(bucketName, objectPrefix string) policyStatement
 func getReadOnlyObjectStatement(bucketName, objectPrefix string) policyStatement {
 	objectResourceStatement := policyStatement{}
 	objectResourceStatement.Effect = "Allow"
-	objectResourceStatement.Principal = map[string]interface{}{
-		"AWS": "*",
-	}
+	objectResourceStatement.Principal.AWS = set.CreateStringSet([]string{"*"}...)
 	objectResourceStatement.Resources = set.CreateStringSet([]string{fmt.Sprintf("%s%s", AWSResourcePrefix, bucketName+"/"+objectPrefix+"*")}...)
 	objectResourceStatement.Actions = set.CreateStringSet(readOnlyObjectActions...)
 	return objectResourceStatement
@@ -141,9 +133,7 @@ func getWriteOnlyBucketStatement(bucketName, objectPrefix string) policyStatemen

 	bucketResourceStatement := policyStatement{}
 	bucketResourceStatement.Effect = "Allow"
-	bucketResourceStatement.Principal = map[string]interface{}{
-		"AWS": "*",
-	}
+	bucketResourceStatement.Principal.AWS = set.CreateStringSet([]string{"*"}...)
 	bucketResourceStatement.Resources = set.CreateStringSet([]string{fmt.Sprintf("%s%s", AWSResourcePrefix, bucketName)}...)
 	bucketResourceStatement.Actions = set.CreateStringSet(writeOnlyBucketActions...)
 	return bucketResourceStatement
@@ -153,9 +143,7 @@ func getWriteOnlyBucketStatement(bucketName, objectPrefix string) policyStatemen
 func getWriteOnlyObjectStatement(bucketName, objectPrefix string) policyStatement {
 	objectResourceStatement := policyStatement{}
 	objectResourceStatement.Effect = "Allow"
-	objectResourceStatement.Principal = map[string]interface{}{
-		"AWS": "*",
-	}
+	objectResourceStatement.Principal.AWS = set.CreateStringSet([]string{"*"}...)
 	objectResourceStatement.Resources = set.CreateStringSet([]string{fmt.Sprintf("%s%s", AWSResourcePrefix, bucketName+"/"+objectPrefix+"*")}...)
 	objectResourceStatement.Actions = set.CreateStringSet(writeOnlyObjectActions...)
 	return objectResourceStatement
@@ -184,14 +172,14 @@ func TestIsValidActions(t *testing.T) {
 		// Test case - 1.
 		// "s3:ListObject" is an invalid Action.
 		{set.CreateStringSet([]string{"s3:GetObject", "s3:ListObject", "s3:RemoveObject"}...),
-			errors.New("Unsupported actions found: ‘set.StringSet{\"s3:RemoveObject\":struct {}{}, \"s3:ListObject\":struct {}{}}’, please validate your policy document"), false},
+			errors.New("Unsupported actions found: ‘set.StringSet{\"s3:RemoveObject\":struct {}{}, \"s3:ListObject\":struct {}{}}’, please validate your policy document."), false},
 		// Test case - 2.
 		// Empty Actions.
-		{set.CreateStringSet([]string{}...), errors.New("Action list cannot be empty"), false},
+		{set.CreateStringSet([]string{}...), errors.New("Action list cannot be empty."), false},
 		// Test case - 3.
 		// "s3:DeleteEverything"" is an invalid Action.
 		{set.CreateStringSet([]string{"s3:GetObject", "s3:ListBucket", "s3:PutObject", "s3:DeleteEverything"}...),
-			errors.New("Unsupported actions found: ‘set.StringSet{\"s3:DeleteEverything\":struct {}{}}’, please validate your policy document"), false},
+			errors.New("Unsupported actions found: ‘set.StringSet{\"s3:DeleteEverything\":struct {}{}}’, please validate your policy document."), false},
 		// Inputs with valid Action.
 		// Test Case - 4.
 		{set.CreateStringSet([]string{
@@ -223,13 +211,13 @@ func TestIsValidEffect(t *testing.T) {
 	}{
 		// Inputs with unsupported Effect.
 		// Test case - 1.
-		{"", errors.New("Policy effect cannot be empty"), false},
+		{"", errors.New("Policy effect cannot be empty."), false},
 		// Test case - 2.
-		{"DontAllow", errors.New("Unsupported Effect found: ‘DontAllow’, please validate your policy document"), false},
+		{"DontAllow", errors.New("Unsupported Effect found: ‘DontAllow’, please validate your policy document."), false},
 		// Test case - 3.
-		{"NeverAllow", errors.New("Unsupported Effect found: ‘NeverAllow’, please validate your policy document"), false},
+		{"NeverAllow", errors.New("Unsupported Effect found: ‘NeverAllow’, please validate your policy document."), false},
 		// Test case - 4.
-		{"AllowAlways", errors.New("Unsupported Effect found: ‘AllowAlways’, please validate your policy document"), false},
+		{"AllowAlways", errors.New("Unsupported Effect found: ‘AllowAlways’, please validate your policy document."), false},

 		// Inputs with valid Effect.
 		// Test Case - 5.
@@ -267,16 +255,16 @@ func TestIsValidResources(t *testing.T) {
 		// Inputs with unsupported Action.
 		// Test case - 1.
 		// Empty Resources.
-		{[]string{}, errors.New("Resource list cannot be empty"), false},
+		{[]string{}, errors.New("Resource list cannot be empty."), false},
 		// Test case - 2.
 		// A valid resource should have prefix "arn:aws:s3:::".
-		{[]string{"my-resource"}, errors.New("Unsupported resource style found: ‘my-resource’, please validate your policy document"), false},
+		{[]string{"my-resource"}, errors.New("Unsupported resource style found: ‘my-resource’, please validate your policy document."), false},
 		// Test case - 3.
 		// A Valid resource should have bucket name followed by "arn:aws:s3:::".
-		{[]string{"arn:aws:s3:::"}, errors.New("Invalid resource style found: ‘arn:aws:s3:::’, please validate your policy document"), false},
+		{[]string{"arn:aws:s3:::"}, errors.New("Invalid resource style found: ‘arn:aws:s3:::’, please validate your policy document."), false},
 		// Test Case - 4.
 		// Valid resource shouldn't have slash('/') followed by "arn:aws:s3:::".
-		{[]string{"arn:aws:s3:::/"}, errors.New("Invalid resource style found: ‘arn:aws:s3:::/’, please validate your policy document"), false},
+		{[]string{"arn:aws:s3:::/"}, errors.New("Invalid resource style found: ‘arn:aws:s3:::/’, please validate your policy document."), false},

 		// Test cases with valid Resources.
 		{[]string{"arn:aws:s3:::my-bucket"}, nil, true},
@@ -313,20 +301,18 @@ func TestIsValidPrincipals(t *testing.T) {
 		// Inputs with unsupported Principals.
 		// Test case - 1.
 		// Empty Principals list.
-		{[]string{}, errors.New("Principal cannot be empty"), false},
+		{[]string{}, errors.New("Principal cannot be empty."), false},
 		// Test case - 2.
 		// "*" is the only valid principal.
-		{[]string{"my-principal"}, errors.New("Unsupported principals found: ‘set.StringSet{\"my-principal\":struct {}{}}’, please validate your policy document"), false},
+		{[]string{"my-principal"}, errors.New("Unsupported principals found: ‘set.StringSet{\"my-principal\":struct {}{}}’, please validate your policy document."), false},
 		// Test case - 3.
-		{[]string{"*", "111122233"}, errors.New("Unsupported principals found: ‘set.StringSet{\"111122233\":struct {}{}}’, please validate your policy document"), false},
+		{[]string{"*", "111122233"}, errors.New("Unsupported principals found: ‘set.StringSet{\"111122233\":struct {}{}}’, please validate your policy document."), false},
 		// Test case - 4.
 		// Test case with valid principal value.
 		{[]string{"*"}, nil, true},
 	}
 	for i, testCase := range testCases {
-		err := isValidPrincipals(map[string]interface{}{
-			"AWS": testCase.principals,
-		})
+		err := isValidPrincipals(set.CreateStringSet(testCase.principals...))
 		if err != nil && testCase.shouldPass {
 			t.Errorf("Test %d: Expected to pass, but failed with: <ERROR> %s", i+1, err.Error())
 		}
@@ -434,23 +420,23 @@ func TestIsValidConditions(t *testing.T) {
 		// Test case - 1.
 		// "StringValues" is an invalid type.
 		{testConditions[0], fmt.Errorf("Unsupported condition type 'StringValues', " +
-			"please validate your policy document"), false},
+			"please validate your policy document."), false},
 		// Test case - 2.
 		// "s3:Object" is an invalid key.
 		{testConditions[1], fmt.Errorf("Unsupported condition key " +
-			"'StringEquals', please validate your policy document"), false},
+			"'StringEquals', please validate your policy document."), false},
 		// Test case - 3.
 		// Test case with Ambigious conditions set.
 		{testConditions[2], fmt.Errorf("Ambigious condition values for key 's3:prefix', " +
-			"please validate your policy document"), false},
+			"please validate your policy document."), false},
 		// Test case - 4.
 		// Test case with valid and invalid condition types.
 		{testConditions[3], fmt.Errorf("Unsupported condition type 'InvalidType', " +
-			"please validate your policy document"), false},
+			"please validate your policy document."), false},
 		// Test case - 5.
 		// Test case with valid and invalid condition keys.
 		{testConditions[4], fmt.Errorf("Unsupported condition key 'StringEquals', " +
-			"please validate your policy document"), false},
+			"please validate your policy document."), false},
 		// Test cases with valid conditions.
 		// Test case - 6.
 		{testConditions[5], nil, true},
@@ -601,9 +587,7 @@ func TestParseBucketPolicy(t *testing.T) {
 	// set unsupported principals.
 	setUnsupportedPrincipals := func(statements []policyStatement) []policyStatement {
 		// "User1111"" is an Unsupported Principal.
-		statements[0].Principal = map[string]interface{}{
-			"AWS": []string{"*", "User1111"},
-		}
+		statements[0].Principal.AWS = set.CreateStringSet([]string{"*", "User1111"}...)
 		return statements
 	}
 	// set unsupported Resources.
@@ -653,10 +637,10 @@ func TestParseBucketPolicy(t *testing.T) {
 	}{
 		// Test case - 1.
 		// bucketPolicy statement empty.
-		{bucketAccesPolicies[0], bucketPolicy{}, errors.New("Policy statement cannot be empty"), false},
+		{bucketAccesPolicies[0], bucketPolicy{}, errors.New("Policy statement cannot be empty."), false},
 		// Test case - 2.
 		// bucketPolicy version empty.
-		{bucketAccesPolicies[1], bucketPolicy{}, errors.New("Policy version cannot be empty"), false},
+		{bucketAccesPolicies[1], bucketPolicy{}, errors.New("Policy version cannot be empty."), false},
 		// Test case - 3.
 		// Readonly bucketPolicy.
 		{bucketAccesPolicies[2], bucketAccesPolicies[2], nil, true},
@@ -668,16 +652,16 @@ func TestParseBucketPolicy(t *testing.T) {
 		{bucketAccesPolicies[4], bucketAccesPolicies[4], nil, true},
 		// Test case - 6.
 		// bucketPolicy statement contains unsupported action.
-		{bucketAccesPolicies[5], bucketAccesPolicies[5], fmt.Errorf("Unsupported actions found: ‘set.StringSet{\"s3:DeleteEverything\":struct {}{}}’, please validate your policy document"), false},
+		{bucketAccesPolicies[5], bucketAccesPolicies[5], fmt.Errorf("Unsupported actions found: ‘set.StringSet{\"s3:DeleteEverything\":struct {}{}}’, please validate your policy document."), false},
 		// Test case - 7.
 		// bucketPolicy statement contains unsupported Effect.
-		{bucketAccesPolicies[6], bucketAccesPolicies[6], fmt.Errorf("Unsupported Effect found: ‘DontAllow’, please validate your policy document"), false},
+		{bucketAccesPolicies[6], bucketAccesPolicies[6], fmt.Errorf("Unsupported Effect found: ‘DontAllow’, please validate your policy document."), false},
 		// Test case - 8.
 		// bucketPolicy statement contains unsupported Principal.
-		{bucketAccesPolicies[7], bucketAccesPolicies[7], fmt.Errorf("Unsupported principals found: ‘set.StringSet{\"User1111\":struct {}{}}’, please validate your policy document"), false},
+		{bucketAccesPolicies[7], bucketAccesPolicies[7], fmt.Errorf("Unsupported principals found: ‘set.StringSet{\"User1111\":struct {}{}}’, please validate your policy document."), false},
 		// Test case - 9.
 		// bucketPolicy statement contains unsupported Resource.
-		{bucketAccesPolicies[8], bucketAccesPolicies[8], fmt.Errorf("Unsupported resource style found: ‘my-resource’, please validate your policy document"), false},
+		{bucketAccesPolicies[8], bucketAccesPolicies[8], fmt.Errorf("Unsupported resource style found: ‘my-resource’, please validate your policy document."), false},
 	}
 	for i, testCase := range testCases {
 		var buffer bytes.Buffer
@@ -18,7 +18,7 @@ package cmd

 import (
 	"bytes"
-	"encoding/json"
+	"errors"
 	"io"
 	"path"
 	"sync"
@@ -36,16 +36,6 @@ type bucketPolicies struct {
 	bucketPolicyConfigs map[string]*bucketPolicy
 }

-// Represent a policy change
-type policyChange struct {
-	// isRemove is true if the policy change is to delete the
-	// policy on a bucket.
-	IsRemove bool
-
-	// represents the new policy for the bucket
-	BktPolicy *bucketPolicy
-}
-
 // Fetch bucket policy for a given bucket.
 func (bp bucketPolicies) GetBucketPolicy(bucket string) *bucketPolicy {
 	bp.rwMutex.RLock()
@@ -54,61 +44,49 @@ func (bp bucketPolicies) GetBucketPolicy(bucket string) *bucketPolicy {
 }

 // Set a new bucket policy for a bucket, this operation will overwrite
-// any previous bucket policies for the bucket.
-func (bp *bucketPolicies) SetBucketPolicy(bucket string, pCh policyChange) error {
+// any previous bucketpolicies for the bucket.
+func (bp *bucketPolicies) SetBucketPolicy(bucket string, policy *bucketPolicy) error {
 	bp.rwMutex.Lock()
 	defer bp.rwMutex.Unlock()
-
-	if pCh.IsRemove {
-		delete(bp.bucketPolicyConfigs, bucket)
-	} else {
-		if pCh.BktPolicy == nil {
-			return errInvalidArgument
-		}
-		bp.bucketPolicyConfigs[bucket] = pCh.BktPolicy
+	if policy == nil {
+		return errors.New("invalid argument")
 	}
+	bp.bucketPolicyConfigs[bucket] = policy
 	return nil
 }

+// Remove bucket policy for a bucket, from in-memory map.
+func (bp *bucketPolicies) RemoveBucketPolicy(bucket string) {
+	bp.rwMutex.Lock()
+	defer bp.rwMutex.Unlock()
+	delete(bp.bucketPolicyConfigs, bucket)
+}
+
 // Loads all bucket policies from persistent layer.
 func loadAllBucketPolicies(objAPI ObjectLayer) (policies map[string]*bucketPolicy, err error) {
 	// List buckets to proceed loading all notification configuration.
 	buckets, err := objAPI.ListBuckets()
-	errorIf(err, "Unable to list buckets.")
 	if err != nil {
-		return nil, errorCause(err)
+		return nil, err
 	}
-
 	policies = make(map[string]*bucketPolicy)
-	var pErrs []error
 	// Loads bucket policy.
 	for _, bucket := range buckets {
-		policy, pErr := readBucketPolicy(bucket.Name, objAPI)
-		if pErr != nil {
-			if !isErrIgnored(pErr, []error{
-				// net.Dial fails for rpc client or any
-				// other unexpected errors during net.Dial.
-				errDiskNotFound,
-			}) {
-				if !isErrBucketPolicyNotFound(pErr) {
-					pErrs = append(pErrs, pErr)
-				}
+		var policy *bucketPolicy
+		policy, err = readBucketPolicy(bucket.Name, objAPI)
+		if err != nil {
+			switch err.(type) {
+			case BucketPolicyNotFound:
+				continue
 			}
-			// Continue to load other bucket policies if possible.
-			continue
+			return nil, err
 		}
 		policies[bucket.Name] = policy
 	}

-	// Look for any errors occurred while reading bucket policies.
-	for _, pErr := range pErrs {
-		if pErr != nil {
-			return policies, pErr
-		}
-	}
-
 	// Success.
 	return policies, nil
+
 }

 // Intialize all bucket policies.
@@ -116,20 +94,16 @@ func initBucketPolicies(objAPI ObjectLayer) error {
 	if objAPI == nil {
 		return errInvalidArgument
 	}
-
 	// Read all bucket policies.
 	policies, err := loadAllBucketPolicies(objAPI)
 	if err != nil {
 		return err
 	}

-	// Populate global bucket collection.
 	globalBucketPolicies = &bucketPolicies{
 		rwMutex:             &sync.RWMutex{},
 		bucketPolicyConfigs: policies,
 	}
-
-	// Success.
 	return nil
 }

@@ -145,23 +119,25 @@ func getOldBucketsConfigPath() (string, error) {
 // readBucketPolicyJSON - reads bucket policy for an input bucket, returns BucketPolicyNotFound
 // if bucket policy is not found.
 func readBucketPolicyJSON(bucket string, objAPI ObjectLayer) (bucketPolicyReader io.Reader, err error) {
+	// Verify bucket is valid.
+	if !IsValidBucketName(bucket) {
+		return nil, BucketNameInvalid{Bucket: bucket}
+	}
 	policyPath := pathJoin(bucketConfigPrefix, bucket, policyJSON)
 	objInfo, err := objAPI.GetObjectInfo(minioMetaBucket, policyPath)
 	if err != nil {
-		if isErrObjectNotFound(err) || isErrIncompleteBody(err) {
+		if _, ok := err.(ObjectNotFound); ok {
 			return nil, BucketPolicyNotFound{Bucket: bucket}
 		}
-		errorIf(err, "Unable to load policy for the bucket %s.", bucket)
-		return nil, errorCause(err)
+		return nil, err
 	}
 	var buffer bytes.Buffer
 	err = objAPI.GetObject(minioMetaBucket, policyPath, 0, objInfo.Size, &buffer)
 	if err != nil {
-		if isErrObjectNotFound(err) || isErrIncompleteBody(err) {
+		if _, ok := err.(ObjectNotFound); ok {
 			return nil, BucketPolicyNotFound{Bucket: bucket}
 		}
-		errorIf(err, "Unable to load policy for the bucket %s.", bucket)
-		return nil, errorCause(err)
+		return nil, err
 	}

 	return &buffer, nil
@@ -189,10 +165,13 @@ func readBucketPolicy(bucket string, objAPI ObjectLayer) (*bucketPolicy, error)
 // removeBucketPolicy - removes any previously written bucket policy. Returns BucketPolicyNotFound
 // if no policies are found.
 func removeBucketPolicy(bucket string, objAPI ObjectLayer) error {
+	// Verify bucket is valid.
+	if !IsValidBucketName(bucket) {
+		return BucketNameInvalid{Bucket: bucket}
+	}
+
 	policyPath := pathJoin(bucketConfigPrefix, bucket, policyJSON)
 	if err := objAPI.DeleteObject(minioMetaBucket, policyPath); err != nil {
-		errorIf(err, "Unable to remove bucket-policy on bucket %s.", bucket)
-		err = errorCause(err)
 		if _, ok := err.(ObjectNotFound); ok {
 			return BucketPolicyNotFound{Bucket: bucket}
 		}
@@ -201,17 +180,14 @@ func removeBucketPolicy(bucket string, objAPI ObjectLayer) error {
 	return nil
 }

-// writeBucketPolicy - save a bucket policy that is assumed to be validated.
-func writeBucketPolicy(bucket string, objAPI ObjectLayer, bpy *bucketPolicy) error {
-	buf, err := json.Marshal(bpy)
-	if err != nil {
-		errorIf(err, "Unable to marshal bucket policy '%v' to JSON", *bpy)
-		return err
+// writeBucketPolicy - save all bucket policies.
+func writeBucketPolicy(bucket string, objAPI ObjectLayer, reader io.Reader, size int64) error {
+	// Verify if bucket path legal
+	if !IsValidBucketName(bucket) {
+		return BucketNameInvalid{Bucket: bucket}
 	}
+
 	policyPath := pathJoin(bucketConfigPrefix, bucket, policyJSON)
-	if _, err := objAPI.PutObject(minioMetaBucket, policyPath, int64(len(buf)), bytes.NewReader(buf), nil, ""); err != nil {
-		errorIf(err, "Unable to set policy for the bucket %s", bucket)
-		return errorCause(err)
-	}
-	return nil
+	_, err := objAPI.PutObject(minioMetaBucket, policyPath, size, reader, nil)
+	return err
 }
@@ -17,10 +17,6 @@
 package cmd

 import (
-	"crypto/x509"
-	"encoding/pem"
-	"errors"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -31,11 +27,7 @@ func createCertsPath() error {
 	if err != nil {
 		return err
 	}
-	if err := os.MkdirAll(certsPath, 0700); err != nil {
-		return err
-	}
-	rootCAsPath := filepath.Join(certsPath, globalMinioCertsCADir)
-	return os.MkdirAll(rootCAsPath, 0700)
+	return os.MkdirAll(certsPath, 0700)
 }

 // getCertsPath get certs path.
@@ -66,25 +58,6 @@ func mustGetKeyFile() string {
 	return filepath.Join(mustGetCertsPath(), globalMinioKeyFile)
 }

-// mustGetCAFiles must get the list of the CA certificates stored in minio config dir
-func mustGetCAFiles() (caCerts []string) {
-	CAsDir := filepath.Join(mustGetCertsPath(), globalMinioCertsCADir)
-	caFiles, _ := ioutil.ReadDir(CAsDir)
-	for _, cert := range caFiles {
-		caCerts = append(caCerts, filepath.Join(CAsDir, cert.Name()))
-	}
-	return
-}
-
-// mustGetSystemCertPool returns empty cert pool in case of error (windows)
-func mustGetSystemCertPool() *x509.CertPool {
-	pool, err := x509.SystemCertPool()
-	if err != nil {
-		return x509.NewCertPool()
-	}
-	return pool
-}
-
 // isCertFileExists verifies if cert file exists, returns true if
 // found, false otherwise.
 func isCertFileExists() bool {
@@ -109,39 +82,8 @@ func isKeyFileExists() bool {

 // isSSL - returns true with both cert and key exists.
 func isSSL() bool {
-	return isCertFileExists() && isKeyFileExists()
-}
-
-// Reads certificated file and returns a list of parsed certificates.
-func readCertificateChain() ([]*x509.Certificate, error) {
-	bytes, err := ioutil.ReadFile(mustGetCertFile())
-	if err != nil {
-		return nil, err
+	if isCertFileExists() && isKeyFileExists() {
+		return true
 	}
-
-	// Proceed to parse the certificates.
-	return parseCertificateChain(bytes)
-}
-
-// Parses certificate chain, returns a list of parsed certificates.
-func parseCertificateChain(bytes []byte) ([]*x509.Certificate, error) {
-	var certs []*x509.Certificate
-	var block *pem.Block
-	current := bytes
-
-	// Parse all certs in the chain.
-	for len(current) > 0 {
-		block, current = pem.Decode(current)
-		if block == nil {
-			return nil, errors.New("Could not PEM block")
-		}
-		// Parse the decoded certificate.
-		cert, err := x509.ParseCertificate(block.Bytes)
-		if err != nil {
-			return nil, err
-		}
-		certs = append(certs, cert)
-
-	}
-	return certs, nil
+	return false
 }
@@ -58,54 +58,3 @@ func TestGetFiles(t *testing.T) {
 		t.Errorf("KeyFile does not contain %s", globalMinioKeyFile)
 	}
 }
-
-// Parses .crt file contents
-func TestParseCertificateChain(t *testing.T) {
-	// given
-	cert := `-----BEGIN CERTIFICATE-----
-MIICdTCCAd4CCQCO5G/W1xcE9TANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJa
-WTEOMAwGA1UECBMFTWluaW8xETAPBgNVBAcTCEludGVybmV0MQ4wDAYDVQQKEwVN
-aW5pbzEOMAwGA1UECxMFTWluaW8xDjAMBgNVBAMTBU1pbmlvMR0wGwYJKoZIhvcN
-AQkBFg50ZXN0c0BtaW5pby5pbzAeFw0xNjEwMTQxMTM0MjJaFw0xNzEwMTQxMTM0
-MjJaMH8xCzAJBgNVBAYTAlpZMQ4wDAYDVQQIEwVNaW5pbzERMA8GA1UEBxMISW50
-ZXJuZXQxDjAMBgNVBAoTBU1pbmlvMQ4wDAYDVQQLEwVNaW5pbzEOMAwGA1UEAxMF
-TWluaW8xHTAbBgkqhkiG9w0BCQEWDnRlc3RzQG1pbmlvLmlvMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQDwNUYB/Sj79WsUE8qnXzzh2glSzWxUE79sCOpQYK83
-HWkrl5WxlG8ZxDR1IQV9Ex/lzigJu8G+KXahon6a+3n5GhNrYRe5kIXHQHz0qvv4
-aMulqlnYpvSfC83aaO9GVBtwXS/O4Nykd7QBg4nZlazVmsGk7POOjhpjGShRsqpU
-JwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBALqjOA6bD8BEl7hkQ8XwX/owSAL0URDe
-nUfCOsXgIIAqgw4uTCLOfCJVZNKmRT+KguvPAQ6Z80vau2UxPX5Q2Q+OHXDRrEnK
-FjqSBgLP06Qw7a++bshlWGTt5bHWOneW3EQikedckVuIKPkOCib9yGi4VmBBjdFE
-M9ofSEt/bdRD
-----END CERTIFICATE-----`
-
-	// when
-	certs, err := parseCertificateChain([]byte(cert))
-
-	// then
-	if err != nil {
-		t.Fatalf("Could not parse certificate: %s", err)
-	}
-
-	if len(certs) != 1 {
-		t.Fatalf("Expected number of certificates in chain was 1, actual: %d", len(certs))
-	}
-
-	if certs[0].Subject.CommonName != "Minio" {
-		t.Fatalf("Expected Subject.CommonName was Minio, actual: %s", certs[0].Subject.CommonName)
-	}
-}
-
-// Parses invalid .crt file contents and returns error
-func TestParseInvalidCertificateChain(t *testing.T) {
-	// given
-	cert := `This is now valid certificate`
-
-	// when
-	_, err := parseCertificateChain([]byte(cert))
-
-	// then
-	if err == nil {
-		t.Fatalf("Expected error but none occurred")
-	}
-}
@@ -17,6 +17,7 @@
 package cmd

 import (
+	"fmt"
 	"net"
 	"os"
 	"syscall"
@@ -31,16 +32,10 @@ import (
 // This causes confusion on Mac OSX that minio server is not reachable
 // on 127.0.0.1 even though minio server is running. So before we start
 // the minio server we make sure that the port is free on each tcp network.
-//
-// Port is string on purpose here.
-// https://github.com/golang/go/issues/16142#issuecomment-245912773
-//
-// "Keep in mind that ports in Go are strings: https://play.golang.org/p/zk2WEri_E9"
-//                 - @bradfitz
-func checkPortAvailability(portStr string) error {
+func checkPortAvailability(port int) error {
 	network := [3]string{"tcp", "tcp4", "tcp6"}
 	for _, n := range network {
-		l, err := net.Listen(n, net.JoinHostPort("", portStr))
+		l, err := net.Listen(n, fmt.Sprintf(":%d", port))
 		if err != nil {
 			if isAddrInUse(err) {
 				// Return error if another process is listening on the
@@ -17,6 +17,7 @@
 package cmd

 import (
+	"fmt"
 	"net"
 	"runtime"
 	"testing"
@@ -25,7 +26,7 @@ import (
 // Tests for port availability logic written for server startup sequence.
 func TestCheckPortAvailability(t *testing.T) {
 	tests := []struct {
-		port string
+		port int
 	}{
 		{getFreePort()},
 		{getFreePort()},
@@ -34,11 +35,11 @@ func TestCheckPortAvailability(t *testing.T) {
 		// This test should pass if the ports are available
 		err := checkPortAvailability(test.port)
 		if err != nil {
-			t.Fatalf("checkPortAvailability test failed for port: %s. Error: %v", test.port, err)
+			t.Fatalf("checkPortAvailability test failed for port: %d. Error: %v", test.port, err)
 		}

 		// Now use the ports and check again
-		ln, err := net.Listen("tcp", net.JoinHostPort("", test.port))
+		ln, err := net.Listen("tcp", fmt.Sprintf(":%d", test.port))
 		if err != nil {
 			t.Fail()
 		}
@@ -48,7 +49,7 @@ func TestCheckPortAvailability(t *testing.T) {

 		// Skip if the os is windows due to https://github.com/golang/go/issues/7598
 		if err == nil && runtime.GOOS != "windows" {
-			t.Fatalf("checkPortAvailability should fail for port: %s. Error: %v", test.port, err)
+			t.Fatalf("checkPortAvailability should fail for port: %d. Error: %v", test.port, err)
 		}
 	}
 }
@@ -24,6 +24,19 @@ var commands = []cli.Command{}
 // Collection of minio commands currently supported in a trie tree.
 var commandsTree = newTrie()

+// Collection of minio flags currently supported.
+var globalFlags = []cli.Flag{
+	cli.StringFlag{
+		Name:  "config-dir, C",
+		Value: mustGetConfigPath(),
+		Usage: "Path to configuration folder.",
+	},
+	cli.BoolFlag{
+		Name:  "quiet",
+		Usage: "Suppress chatty output.",
+	},
+}
+
 // registerCommand registers a cli command.
 func registerCommand(command cli.Command) {
 	commands = append(commands, command)
@@ -17,7 +17,7 @@
 package cmd

 import (
-	"fmt"
+	"errors"
 	"os"
 	"path/filepath"

@@ -25,84 +25,51 @@ import (
 	"github.com/minio/minio/pkg/quick"
 )

-func migrateConfig() error {
+func migrateConfig() {
 	// Purge all configs with version '1'.
-	if err := purgeV1(); err != nil {
-		return err
-	}
+	purgeV1()
 	// Migrate version '2' to '3'.
-	if err := migrateV2ToV3(); err != nil {
-		return err
-	}
+	migrateV2ToV3()
 	// Migrate version '3' to '4'.
-	if err := migrateV3ToV4(); err != nil {
-		return err
-	}
+	migrateV3ToV4()
 	// Migrate version '4' to '5'.
-	if err := migrateV4ToV5(); err != nil {
-		return err
-	}
+	migrateV4ToV5()
 	// Migrate version '5' to '6.
-	if err := migrateV5ToV6(); err != nil {
-		return err
-	}
+	migrateV5ToV6()
 	// Migrate version '6' to '7'.
-	if err := migrateV6ToV7(); err != nil {
-		return err
-	}
-	// Migrate version '7' to '8'.
-	if err := migrateV7ToV8(); err != nil {
-		return err
-	}
-	// Migrate version '8' to '9'.
-	if err := migrateV8ToV9(); err != nil {
-		return err
-	}
-	// Migrate version '9' to '10'.
-	if err := migrateV9ToV10(); err != nil {
-		return err
-	}
-	return nil
+	migrateV6ToV7()
 }

 // Version '1' is not supported anymore and deprecated, safe to delete.
-func purgeV1() error {
+func purgeV1() {
 	cv1, err := loadConfigV1()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘1’. %v", err)
-
+	if err != nil && os.IsNotExist(err) {
+		return
 	}
+	fatalIf(err, "Unable to load config version ‘1’.")

 	if cv1.Version == "1" {
 		console.Println("Removed unsupported config version ‘1’.")
 		/// Purge old fsUsers.json file
 		configPath, err := getConfigPath()
-		if err != nil {
-			return fmt.Errorf("Unable to retrieve config path. %v", err)
-		}
+		fatalIf(err, "Unable to retrieve config path.")

 		configFile := filepath.Join(configPath, "fsUsers.json")
 		removeAll(configFile)
-		return nil
 	}
-	return fmt.Errorf("Failed to migrate unrecognized config version ‘" + cv1.Version + "’.")
+	fatalIf(errors.New(""), "Failed to migrate unrecognized config version ‘"+cv1.Version+"’.")
 }

 // Version '2' to '3' config migration adds new fields and re-orders
 // previous fields. Simplifies config for future additions.
-func migrateV2ToV3() error {
+func migrateV2ToV3() {
 	cv2, err := loadConfigV2()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘2’. %v", err)
+	if err != nil && os.IsNotExist(err) {
+		return
 	}
+	fatalIf(err, "Unable to load config version ‘2’.")
 	if cv2.Version != "2" {
-		return nil
+		return
 	}
 	srvConfig := &configV3{}
 	srvConfig.Version = "3"
@@ -128,7 +95,7 @@ func migrateV2ToV3() error {
 	}
 	srvConfig.Logger.File = flogger

-	slogger := syslogLoggerV3{}
+	slogger := syslogLogger{}
 	slogger.Level = "debug"
 	if cv2.SyslogLogger.Addr != "" {
 		slogger.Enable = true
@@ -137,38 +104,29 @@ func migrateV2ToV3() error {
 	srvConfig.Logger.Syslog = slogger

 	qc, err := quick.New(srvConfig)
-	if err != nil {
-		return fmt.Errorf("Unable to initialize config. %v", err)
-	}
+	fatalIf(err, "Unable to initialize config.")

 	configFile, err := getConfigFile()
-	if err != nil {
-		return fmt.Errorf("Unable to get config file. %v", err)
-	}
+	fatalIf(err, "Unable to get config file.")

 	// Migrate the config.
 	err = qc.Save(configFile)
-	if err != nil {
-		return fmt.Errorf("Failed to migrate config from ‘"+cv2.Version+"’ to ‘"+srvConfig.Version+"’ failed. %v", err)
-	}
+	fatalIf(err, "Failed to migrate config from ‘"+cv2.Version+"’ to ‘"+srvConfig.Version+"’ failed.")

 	console.Println("Migration from version ‘" + cv2.Version + "’ to ‘" + srvConfig.Version + "’ completed successfully.")
-	return nil
 }

 // Version '3' to '4' migrates config, removes previous fields related
 // to backend types and server address. This change further simplifies
 // the config for future additions.
-func migrateV3ToV4() error {
+func migrateV3ToV4() {
 	cv3, err := loadConfigV3()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘3’. %v", err)
+	if err != nil && os.IsNotExist(err) {
+		return
 	}
+	fatalIf(err, "Unable to load config version ‘3’.")
 	if cv3.Version != "3" {
-		return nil
+		return
 	}

 	// Save only the new fields, ignore the rest.
@@ -185,36 +143,27 @@ func migrateV3ToV4() error {
 	srvConfig.Logger.Syslog = cv3.Logger.Syslog

 	qc, err := quick.New(srvConfig)
-	if err != nil {
-		return fmt.Errorf("Unable to initialize the quick config. %v", err)
-	}
+	fatalIf(err, "Unable to initialize the quick config.")
 	configFile, err := getConfigFile()
-	if err != nil {
-		return fmt.Errorf("Unable to get config file. %v", err)
-	}
+	fatalIf(err, "Unable to get config file.")

 	err = qc.Save(configFile)
-	if err != nil {
-		return fmt.Errorf("Failed to migrate config from ‘"+cv3.Version+"’ to ‘"+srvConfig.Version+"’ failed. %v", err)
-	}
+	fatalIf(err, "Failed to migrate config from ‘"+cv3.Version+"’ to ‘"+srvConfig.Version+"’ failed.")

 	console.Println("Migration from version ‘" + cv3.Version + "’ to ‘" + srvConfig.Version + "’ completed successfully.")
-	return nil
 }

 // Version '4' to '5' migrates config, removes previous fields related
 // to backend types and server address. This change further simplifies
 // the config for future additions.
-func migrateV4ToV5() error {
+func migrateV4ToV5() {
 	cv4, err := loadConfigV4()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘4’. %v", err)
+	if err != nil && os.IsNotExist(err) {
+		return
 	}
+	fatalIf(err, "Unable to load config version ‘4’.")
 	if cv4.Version != "4" {
-		return nil
+		return
 	}

 	// Save only the new fields, ignore the rest.
@@ -234,36 +183,27 @@ func migrateV4ToV5() error {
 	srvConfig.Logger.Redis.Enable = false

 	qc, err := quick.New(srvConfig)
-	if err != nil {
-		return fmt.Errorf("Unable to initialize the quick config. %v", err)
-	}
+	fatalIf(err, "Unable to initialize the quick config.")
 	configFile, err := getConfigFile()
-	if err != nil {
-		return fmt.Errorf("Unable to get config file. %v", err)
-	}
+	fatalIf(err, "Unable to get config file.")

 	err = qc.Save(configFile)
-	if err != nil {
-		return fmt.Errorf("Failed to migrate config from ‘"+cv4.Version+"’ to ‘"+srvConfig.Version+"’ failed. %v", err)
-	}
+	fatalIf(err, "Failed to migrate config from ‘"+cv4.Version+"’ to ‘"+srvConfig.Version+"’ failed.")

 	console.Println("Migration from version ‘" + cv4.Version + "’ to ‘" + srvConfig.Version + "’ completed successfully.")
-	return nil
 }

 // Version '5' to '6' migrates config, removes previous fields related
 // to backend types and server address. This change further simplifies
 // the config for future additions.
-func migrateV5ToV6() error {
+func migrateV5ToV6() {
 	cv5, err := loadConfigV5()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘5’. %v", err)
+	if err != nil && os.IsNotExist(err) {
+		return
 	}
+	fatalIf(err, "Unable to load config version ‘5’.")
 	if cv5.Version != "5" {
-		return nil
+		return
 	}

 	// Save only the new fields, ignore the rest.
@@ -310,41 +250,32 @@ func migrateV5ToV6() error {
 	}

 	qc, err := quick.New(srvConfig)
-	if err != nil {
-		return fmt.Errorf("Unable to initialize the quick config. %v", err)
-	}
+	fatalIf(err, "Unable to initialize the quick config.")
 	configFile, err := getConfigFile()
-	if err != nil {
-		return fmt.Errorf("Unable to get config file. %v", err)
-	}
+	fatalIf(err, "Unable to get config file.")

 	err = qc.Save(configFile)
-	if err != nil {
-		return fmt.Errorf("Failed to migrate config from ‘"+cv5.Version+"’ to ‘"+srvConfig.Version+"’ failed. %v", err)
-	}
+	fatalIf(err, "Failed to migrate config from ‘"+cv5.Version+"’ to ‘"+srvConfig.Version+"’ failed.")

 	console.Println("Migration from version ‘" + cv5.Version + "’ to ‘" + srvConfig.Version + "’ completed successfully.")
-	return nil
 }

 // Version '6' to '7' migrates config, removes previous fields related
 // to backend types and server address. This change further simplifies
 // the config for future additions.
-func migrateV6ToV7() error {
+func migrateV6ToV7() {
 	cv6, err := loadConfigV6()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘6’. %v", err)
+	if err != nil && os.IsNotExist(err) {
+		return
 	}
+	fatalIf(err, "Unable to load config version ‘6’.")
 	if cv6.Version != "6" {
-		return nil
+		return
 	}

 	// Save only the new fields, ignore the rest.
 	srvConfig := &serverConfigV7{}
-	srvConfig.Version = "7"
+	srvConfig.Version = globalMinioConfigVersion
 	srvConfig.Credential = cv6.Credential
 	srvConfig.Region = cv6.Region
 	if srvConfig.Region == "" {
@@ -374,262 +305,12 @@ func migrateV6ToV7() error {
 	}

 	qc, err := quick.New(srvConfig)
-	if err != nil {
-		return fmt.Errorf("Unable to initialize the quick config. %v", err)
-	}
+	fatalIf(err, "Unable to initialize the quick config.")
 	configFile, err := getConfigFile()
-	if err != nil {
-		return fmt.Errorf("Unable to get config file. %v", err)
-	}
+	fatalIf(err, "Unable to get config file.")

 	err = qc.Save(configFile)
-	if err != nil {
-		return fmt.Errorf("Failed to migrate config from ‘"+cv6.Version+"’ to ‘"+srvConfig.Version+"’ failed. %v", err)
-	}
+	fatalIf(err, "Failed to migrate config from ‘"+cv6.Version+"’ to ‘"+srvConfig.Version+"’ failed.")

 	console.Println("Migration from version ‘" + cv6.Version + "’ to ‘" + srvConfig.Version + "’ completed successfully.")
-	return nil
-}
-
-// Version '7' to '8' migrates config, removes previous fields related
-// to backend types and server address. This change further simplifies
-// the config for future additions.
-func migrateV7ToV8() error {
-	cv7, err := loadConfigV7()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘7’. %v", err)
-	}
-	if cv7.Version != "7" {
-		return nil
-	}
-
-	// Save only the new fields, ignore the rest.
-	srvConfig := &serverConfigV8{}
-	srvConfig.Version = "8"
-	srvConfig.Credential = cv7.Credential
-	srvConfig.Region = cv7.Region
-	if srvConfig.Region == "" {
-		// Region needs to be set for AWS Signature Version 4.
-		srvConfig.Region = "us-east-1"
-	}
-	srvConfig.Logger.Console = cv7.Logger.Console
-	srvConfig.Logger.File = cv7.Logger.File
-	srvConfig.Logger.Syslog = cv7.Logger.Syslog
-	srvConfig.Notify.AMQP = make(map[string]amqpNotify)
-	srvConfig.Notify.NATS = make(map[string]natsNotify)
-	srvConfig.Notify.ElasticSearch = make(map[string]elasticSearchNotify)
-	srvConfig.Notify.Redis = make(map[string]redisNotify)
-	srvConfig.Notify.PostgreSQL = make(map[string]postgreSQLNotify)
-	if len(cv7.Notify.AMQP) == 0 {
-		srvConfig.Notify.AMQP["1"] = amqpNotify{}
-	} else {
-		srvConfig.Notify.AMQP = cv7.Notify.AMQP
-	}
-	if len(cv7.Notify.NATS) == 0 {
-		srvConfig.Notify.NATS["1"] = natsNotify{}
-	} else {
-		srvConfig.Notify.NATS = cv7.Notify.NATS
-	}
-	if len(cv7.Notify.ElasticSearch) == 0 {
-		srvConfig.Notify.ElasticSearch["1"] = elasticSearchNotify{}
-	} else {
-		srvConfig.Notify.ElasticSearch = cv7.Notify.ElasticSearch
-	}
-	if len(cv7.Notify.Redis) == 0 {
-		srvConfig.Notify.Redis["1"] = redisNotify{}
-	} else {
-		srvConfig.Notify.Redis = cv7.Notify.Redis
-	}
-
-	qc, err := quick.New(srvConfig)
-	if err != nil {
-		return fmt.Errorf("Unable to initialize the quick config. %v", err)
-	}
-	configFile, err := getConfigFile()
-	if err != nil {
-		return fmt.Errorf("Unable to get config file. %v", err)
-	}
-
-	err = qc.Save(configFile)
-	if err != nil {
-		return fmt.Errorf("Failed to migrate config from ‘"+cv7.Version+"’ to ‘"+srvConfig.Version+"’ failed. %v", err)
-	}
-
-	console.Println("Migration from version ‘" + cv7.Version + "’ to ‘" + srvConfig.Version + "’ completed successfully.")
-	return nil
-}
-
-// Version '8' to '9' migration. Adds postgresql notifier
-// configuration, but it's otherwise the same as V8.
-func migrateV8ToV9() error {
-	cv8, err := loadConfigV8()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘8’. %v", err)
-	}
-	if cv8.Version != "8" {
-		return nil
-	}
-
-	// Copy over fields from V8 into V9 config struct
-	srvConfig := &serverConfigV9{}
-	srvConfig.Version = "9"
-	srvConfig.Credential = cv8.Credential
-	srvConfig.Region = cv8.Region
-	if srvConfig.Region == "" {
-		// Region needs to be set for AWS Signature Version 4.
-		srvConfig.Region = "us-east-1"
-	}
-	srvConfig.Logger.Console = cv8.Logger.Console
-	srvConfig.Logger.Console.Level = "error"
-	srvConfig.Logger.File = cv8.Logger.File
-	srvConfig.Logger.Syslog = cv8.Logger.Syslog
-
-	// check and set notifiers config
-	if len(cv8.Notify.AMQP) == 0 {
-		srvConfig.Notify.AMQP = make(map[string]amqpNotify)
-		srvConfig.Notify.AMQP["1"] = amqpNotify{}
-	} else {
-		srvConfig.Notify.AMQP = cv8.Notify.AMQP
-	}
-	if len(cv8.Notify.NATS) == 0 {
-		srvConfig.Notify.NATS = make(map[string]natsNotify)
-		srvConfig.Notify.NATS["1"] = natsNotify{}
-	} else {
-		srvConfig.Notify.NATS = cv8.Notify.NATS
-	}
-	if len(cv8.Notify.ElasticSearch) == 0 {
-		srvConfig.Notify.ElasticSearch = make(map[string]elasticSearchNotify)
-		srvConfig.Notify.ElasticSearch["1"] = elasticSearchNotify{}
-	} else {
-		srvConfig.Notify.ElasticSearch = cv8.Notify.ElasticSearch
-	}
-	if len(cv8.Notify.Redis) == 0 {
-		srvConfig.Notify.Redis = make(map[string]redisNotify)
-		srvConfig.Notify.Redis["1"] = redisNotify{}
-	} else {
-		srvConfig.Notify.Redis = cv8.Notify.Redis
-	}
-	if len(cv8.Notify.PostgreSQL) == 0 {
-		srvConfig.Notify.PostgreSQL = make(map[string]postgreSQLNotify)
-		srvConfig.Notify.PostgreSQL["1"] = postgreSQLNotify{}
-	} else {
-		srvConfig.Notify.PostgreSQL = cv8.Notify.PostgreSQL
-	}
-
-	qc, err := quick.New(srvConfig)
-	if err != nil {
-		return fmt.Errorf("Unable to initialize the quick config. %v",
-			err)
-	}
-	configFile, err := getConfigFile()
-	if err != nil {
-		return fmt.Errorf("Unable to get config file. %v", err)
-	}
-
-	err = qc.Save(configFile)
-	if err != nil {
-		return fmt.Errorf(
-			"Failed to migrate config from ‘"+
-				cv8.Version+"’ to ‘"+srvConfig.Version+
-				"’ failed. %v", err,
-		)
-	}
-
-	console.Println(
-		"Migration from version ‘" +
-			cv8.Version + "’ to ‘" + srvConfig.Version +
-			"’ completed successfully.",
-	)
-	return nil
-}
-
-// Version '9' to '10' migration. Remove syslog config
-// but it's otherwise the same as V9.
-func migrateV9ToV10() error {
-	cv9, err := loadConfigV9()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return fmt.Errorf("Unable to load config version ‘9’. %v", err)
-	}
-	if cv9.Version != "9" {
-		return nil
-	}
-
-	// Copy over fields from V9 into V10 config struct
-	srvConfig := &serverConfigV10{}
-	srvConfig.Version = "10"
-	srvConfig.Credential = cv9.Credential
-	srvConfig.Region = cv9.Region
-	if srvConfig.Region == "" {
-		// Region needs to be set for AWS Signature Version 4.
-		srvConfig.Region = "us-east-1"
-	}
-	srvConfig.Logger.Console = cv9.Logger.Console
-	srvConfig.Logger.File = cv9.Logger.File
-
-	// check and set notifiers config
-	if len(cv9.Notify.AMQP) == 0 {
-		srvConfig.Notify.AMQP = make(map[string]amqpNotify)
-		srvConfig.Notify.AMQP["1"] = amqpNotify{}
-	} else {
-		srvConfig.Notify.AMQP = cv9.Notify.AMQP
-	}
-	if len(cv9.Notify.NATS) == 0 {
-		srvConfig.Notify.NATS = make(map[string]natsNotify)
-		srvConfig.Notify.NATS["1"] = natsNotify{}
-	} else {
-		srvConfig.Notify.NATS = cv9.Notify.NATS
-	}
-	if len(cv9.Notify.ElasticSearch) == 0 {
-		srvConfig.Notify.ElasticSearch = make(map[string]elasticSearchNotify)
-		srvConfig.Notify.ElasticSearch["1"] = elasticSearchNotify{}
-	} else {
-		srvConfig.Notify.ElasticSearch = cv9.Notify.ElasticSearch
-	}
-	if len(cv9.Notify.Redis) == 0 {
-		srvConfig.Notify.Redis = make(map[string]redisNotify)
-		srvConfig.Notify.Redis["1"] = redisNotify{}
-	} else {
-		srvConfig.Notify.Redis = cv9.Notify.Redis
-	}
-	if len(cv9.Notify.PostgreSQL) == 0 {
-		srvConfig.Notify.PostgreSQL = make(map[string]postgreSQLNotify)
-		srvConfig.Notify.PostgreSQL["1"] = postgreSQLNotify{}
-	} else {
-		srvConfig.Notify.PostgreSQL = cv9.Notify.PostgreSQL
-	}
-
-	qc, err := quick.New(srvConfig)
-	if err != nil {
-		return fmt.Errorf("Unable to initialize the quick config. %v",
-			err)
-	}
-	configFile, err := getConfigFile()
-	if err != nil {
-		return fmt.Errorf("Unable to get config file. %v", err)
-	}
-
-	err = qc.Save(configFile)
-	if err != nil {
-		return fmt.Errorf(
-			"Failed to migrate config from ‘"+
-				cv9.Version+"’ to ‘"+srvConfig.Version+
-				"’ failed. %v", err,
-		)
-	}
-
-	console.Println(
-		"Migration from version ‘" +
-			cv9.Version + "’ to ‘" + srvConfig.Version +
-			"’ completed successfully.",
-	)
-	return nil
 }
@@ -1,203 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-// Test if config v1 is purged
-func TestServerConfigMigrateV1(t *testing.T) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Init Test config failed")
-	}
-	// remove the root directory after the test ends.
-	defer removeAll(rootPath)
-
-	setGlobalConfigPath(rootPath)
-
-	// Create a V1 config json file and store it
-	configJSON := "{ \"version\":\"1\", \"accessKeyId\":\"abcde\", \"secretAccessKey\":\"abcdefgh\"}"
-	configPath := rootPath + "/fsUsers.json"
-	if err := ioutil.WriteFile(configPath, []byte(configJSON), 0644); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	// Fire a migrateConfig()
-	if err := migrateConfig(); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-	// Check if config v1 is removed from filesystem
-	if _, err := os.Stat(configPath); err == nil || !os.IsNotExist(err) {
-		t.Fatal("Config V1 file is not purged")
-	}
-
-	// Initialize server config and check again if everything is fine
-	if _, err := initConfig(); err != nil {
-		t.Fatalf("Unable to initialize from updated config file %s", err)
-	}
-}
-
-// Test if all migrate code returns nil when config file does not
-// exist
-func TestServerConfigMigrateInexistentConfig(t *testing.T) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Init Test config failed")
-	}
-	// remove the root directory after the test ends.
-	defer removeAll(rootPath)
-
-	setGlobalConfigPath(rootPath)
-	configPath := rootPath + "/" + globalMinioConfigFile
-
-	// Remove config file
-	if err := os.Remove(configPath); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	if err := migrateV2ToV3(); err != nil {
-		t.Fatal("migrate v2 to v3 should succeed when no config file is found")
-	}
-	if err := migrateV3ToV4(); err != nil {
-		t.Fatal("migrate v3 to v4 should succeed when no config file is found")
-	}
-	if err := migrateV4ToV5(); err != nil {
-		t.Fatal("migrate v4 to v5 should succeed when no config file is found")
-	}
-	if err := migrateV5ToV6(); err != nil {
-		t.Fatal("migrate v5 to v6 should succeed when no config file is found")
-	}
-	if err := migrateV6ToV7(); err != nil {
-		t.Fatal("migrate v6 to v7 should succeed when no config file is found")
-	}
-	if err := migrateV7ToV8(); err != nil {
-		t.Fatal("migrate v7 to v8 should succeed when no config file is found")
-	}
-	if err := migrateV8ToV9(); err != nil {
-		t.Fatal("migrate v8 to v9 should succeed when no config file is found")
-	}
-	if err := migrateV9ToV10(); err != nil {
-		t.Fatal("migrate v9 to v10 should succeed when no config file is found")
-	}
-}
-
-// Test if a config migration from v2 to v10 is successfully done
-func TestServerConfigMigrateV2toV10(t *testing.T) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Init Test config failed")
-	}
-	// remove the root directory after the test ends.
-	defer removeAll(rootPath)
-
-	setGlobalConfigPath(rootPath)
-	configPath := rootPath + "/" + globalMinioConfigFile
-
-	// Create a corrupted config file
-	if err := ioutil.WriteFile(configPath, []byte("{ \"version\":\"2\","), 0644); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-	// Fire a migrateConfig()
-	if err := migrateConfig(); err == nil {
-		t.Fatal("migration should fail with corrupted config file")
-	}
-
-	accessKey := "accessfoo"
-	secretKey := "secretfoo"
-
-	// Create a V2 config json file and store it
-	configJSON := "{ \"version\":\"2\", \"credentials\": {\"accessKeyId\":\"" + accessKey + "\", \"secretAccessKey\":\"" + secretKey + "\", \"region\":\"us-east-1\"}, \"mongoLogger\":{\"addr\":\"127.0.0.1:3543\", \"db\":\"foodb\", \"collection\":\"foo\"}, \"syslogLogger\":{\"network\":\"127.0.0.1:543\", \"addr\":\"addr\"}, \"fileLogger\":{\"filename\":\"log.out\"}}"
-	if err := ioutil.WriteFile(configPath, []byte(configJSON), 0644); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-	// Fire a migrateConfig()
-	if err := migrateConfig(); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	// Initialize server config and check again if everything is fine
-	if _, err := initConfig(); err != nil {
-		t.Fatalf("Unable to initialize from updated config file %s", err)
-	}
-
-	// Check the version number in the upgraded config file
-	expectedVersion := globalMinioConfigVersion
-	if serverConfig.Version != expectedVersion {
-		t.Fatalf("Expect version "+expectedVersion+", found: %v", serverConfig.Version)
-	}
-
-	// Check if accessKey and secretKey are not altered during migration
-	if serverConfig.Credential.AccessKeyID != accessKey {
-		t.Fatalf("Access key lost during migration, expected: %v, found:%v", accessKey, serverConfig.Credential.AccessKeyID)
-	}
-	if serverConfig.Credential.SecretAccessKey != secretKey {
-		t.Fatalf("Secret key lost during migration, expected: %v, found: %v", secretKey, serverConfig.Credential.SecretAccessKey)
-	}
-
-	// Initialize server config and check again if everything is fine
-	if _, err := initConfig(); err != nil {
-		t.Fatalf("Unable to initialize from updated config file %s", err)
-	}
-}
-
-// Test if all migrate code returns error with corrupted config files
-func TestServerConfigMigrateFaultyConfig(t *testing.T) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Init Test config failed")
-	}
-	// remove the root directory after the test ends.
-	defer removeAll(rootPath)
-
-	setGlobalConfigPath(rootPath)
-	configPath := rootPath + "/" + globalMinioConfigFile
-
-	// Create a corrupted config file
-	if err := ioutil.WriteFile(configPath, []byte("{ \"version\":\""), 0644); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	// Test different migrate versions and be sure they are returning an error
-	if err := migrateV2ToV3(); err == nil {
-		t.Fatal("migrateConfigV2ToV3() should fail with a corrupted json")
-	}
-	if err := migrateV3ToV4(); err == nil {
-		t.Fatal("migrateConfigV3ToV4() should fail with a corrupted json")
-	}
-	if err := migrateV4ToV5(); err == nil {
-		t.Fatal("migrateConfigV4ToV5() should fail with a corrupted json")
-	}
-	if err := migrateV5ToV6(); err == nil {
-		t.Fatal("migrateConfigV5ToV6() should fail with a corrupted json")
-	}
-	if err := migrateV6ToV7(); err == nil {
-		t.Fatal("migrateConfigV6ToV7() should fail with a corrupted json")
-	}
-	if err := migrateV7ToV8(); err == nil {
-		t.Fatal("migrateConfigV7ToV8() should fail with a corrupted json")
-	}
-	if err := migrateV8ToV9(); err == nil {
-		t.Fatal("migrateConfigV8ToV9() should fail with a corrupted json")
-	}
-	if err := migrateV9ToV10(); err == nil {
-		t.Fatal("migrateConfigV9ToV10() should fail with a corrupted json")
-	}
-}
@@ -3,7 +3,6 @@ package cmd
 import (
 	"os"
 	"path/filepath"
-	"sync"

 	"github.com/minio/minio/pkg/quick"
 )
@@ -89,13 +88,6 @@ type backendV3 struct {
 	Disks []string `json:"disks,omitempty"`
 }

-// syslogLogger v3
-type syslogLoggerV3 struct {
-	Enable bool   `json:"enable"`
-	Addr   string `json:"address"`
-	Level  string `json:"level"`
-}
-
 // loggerV3 type.
 type loggerV3 struct {
 	Console struct {
@@ -283,12 +275,6 @@ func loadConfigV5() (*configV5, error) {
 	return c, nil
 }

-type loggerV6 struct {
-	Console consoleLogger  `json:"console"`
-	File    fileLogger     `json:"file"`
-	Syslog  syslogLoggerV3 `json:"syslog"`
-}
-
 // configV6 server configuration version '6'.
 type configV6 struct {
 	Version string `json:"version"`
@@ -298,7 +284,7 @@ type configV6 struct {
 	Region     string     `json:"region"`

 	// Additional error logging configuration.
-	Logger loggerV6 `json:"logger"`
+	Logger logger `json:"logger"`

 	// Notification queue configuration.
 	Notify notifier `json:"notify"`
@@ -324,122 +310,3 @@ func loadConfigV6() (*configV6, error) {
 	}
 	return c, nil
 }
-
-// configV7 server configuration version '7'.
-type serverConfigV7 struct {
-	Version string `json:"version"`
-
-	// S3 API configuration.
-	Credential credential `json:"credential"`
-	Region     string     `json:"region"`
-
-	// Additional error logging configuration.
-	Logger loggerV6 `json:"logger"`
-
-	// Notification queue configuration.
-	Notify notifier `json:"notify"`
-
-	// Read Write mutex.
-	rwMutex *sync.RWMutex
-}
-
-// loadConfigV7 load config version '7'.
-func loadConfigV7() (*serverConfigV7, error) {
-	configFile, err := getConfigFile()
-	if err != nil {
-		return nil, err
-	}
-	if _, err = os.Stat(configFile); err != nil {
-		return nil, err
-	}
-	c := &serverConfigV7{}
-	c.Version = "7"
-	qc, err := quick.New(c)
-	if err != nil {
-		return nil, err
-	}
-	if err := qc.Load(configFile); err != nil {
-		return nil, err
-	}
-	return c, nil
-}
-
-// serverConfigV8 server configuration version '8'. Adds NATS notifier
-// configuration.
-type serverConfigV8 struct {
-	Version string `json:"version"`
-
-	// S3 API configuration.
-	Credential credential `json:"credential"`
-	Region     string     `json:"region"`
-
-	// Additional error logging configuration.
-	Logger loggerV6 `json:"logger"`
-
-	// Notification queue configuration.
-	Notify notifier `json:"notify"`
-
-	// Read Write mutex.
-	rwMutex *sync.RWMutex
-}
-
-// loadConfigV8 load config version '8'.
-func loadConfigV8() (*serverConfigV8, error) {
-	configFile, err := getConfigFile()
-	if err != nil {
-		return nil, err
-	}
-	if _, err = os.Stat(configFile); err != nil {
-		return nil, err
-	}
-	c := &serverConfigV8{}
-	c.Version = "8"
-	qc, err := quick.New(c)
-	if err != nil {
-		return nil, err
-	}
-	if err := qc.Load(configFile); err != nil {
-		return nil, err
-	}
-	return c, nil
-}
-
-// serverConfigV9 server configuration version '9'. Adds PostgreSQL
-// notifier configuration.
-type serverConfigV9 struct {
-	Version string `json:"version"`
-
-	// S3 API configuration.
-	Credential credential `json:"credential"`
-	Region     string     `json:"region"`
-
-	// Additional error logging configuration.
-	Logger loggerV6 `json:"logger"`
-
-	// Notification queue configuration.
-	Notify notifier `json:"notify"`
-
-	// Read Write mutex.
-	rwMutex *sync.RWMutex
-}
-
-func loadConfigV9() (*serverConfigV9, error) {
-	configFile, err := getConfigFile()
-	if err != nil {
-		return nil, err
-	}
-	if _, err = os.Stat(configFile); err != nil {
-		return nil, err
-	}
-	srvCfg := &serverConfigV9{}
-	srvCfg.Version = "9"
-	srvCfg.rwMutex = &sync.RWMutex{}
-	qc, err := quick.New(srvCfg)
-	if err != nil {
-		return nil, err
-	}
-	if err := qc.Load(configFile); err != nil {
-		return nil, err
-	}
-	return srvCfg, nil
-}
@@ -23,9 +23,8 @@ import (
 	"github.com/minio/minio/pkg/quick"
 )

-// serverConfigV10 server configuration version '10' which is like version '9'
-// except it drops support of syslog config
-type serverConfigV10 struct {
+// serverConfigV7 server configuration version '7'.
+type serverConfigV7 struct {
 	Version string `json:"version"`

 	// S3 API configuration.
@@ -42,11 +41,11 @@ type serverConfigV10 struct {
 	rwMutex *sync.RWMutex
 }

-// initConfig - initialize server config and indicate if we are creating a new file or we are just loading
-func initConfig() (bool, error) {
+// initConfig - initialize server config. config version (called only once).
+func initConfig() error {
 	if !isConfigFileExists() {
 		// Initialize server config.
-		srvCfg := &serverConfigV10{}
+		srvCfg := &serverConfigV7{}
 		srvCfg.Version = globalMinioConfigVersion
 		srvCfg.Region = "us-east-1"
 		srvCfg.Credential = mustGenAccessKeys()
@@ -54,7 +53,7 @@ func initConfig() (bool, error) {
 		// Enable console logger by default on a fresh run.
 		srvCfg.Logger.Console = consoleLogger{
 			Enable: true,
-			Level:  "error",
+			Level:  "fatal",
 		}

 		// Make sure to initialize notification configs.
@@ -64,54 +63,50 @@ func initConfig() (bool, error) {
 		srvCfg.Notify.ElasticSearch["1"] = elasticSearchNotify{}
 		srvCfg.Notify.Redis = make(map[string]redisNotify)
 		srvCfg.Notify.Redis["1"] = redisNotify{}
-		srvCfg.Notify.NATS = make(map[string]natsNotify)
-		srvCfg.Notify.NATS["1"] = natsNotify{}
-		srvCfg.Notify.PostgreSQL = make(map[string]postgreSQLNotify)
-		srvCfg.Notify.PostgreSQL["1"] = postgreSQLNotify{}
 		srvCfg.rwMutex = &sync.RWMutex{}

 		// Create config path.
 		err := createConfigPath()
 		if err != nil {
-			return false, err
+			return err
 		}

 		// Save the new config globally.
 		serverConfig = srvCfg

 		// Save config into file.
-		return true, serverConfig.Save()
+		return serverConfig.Save()
 	}
 	configFile, err := getConfigFile()
 	if err != nil {
-		return false, err
+		return err
 	}
 	if _, err = os.Stat(configFile); err != nil {
-		return false, err
+		return err
 	}
-	srvCfg := &serverConfigV10{}
+	srvCfg := &serverConfigV7{}
 	srvCfg.Version = globalMinioConfigVersion
 	srvCfg.rwMutex = &sync.RWMutex{}
 	qc, err := quick.New(srvCfg)
 	if err != nil {
-		return false, err
+		return err
 	}
 	if err := qc.Load(configFile); err != nil {
-		return false, err
+		return err
 	}
 	// Save the loaded config globally.
 	serverConfig = srvCfg
 	// Set the version properly after the unmarshalled json is loaded.
 	serverConfig.Version = globalMinioConfigVersion

-	return false, nil
+	return nil
 }

 // serverConfig server config.
-var serverConfig *serverConfigV10
+var serverConfig *serverConfigV7

 // GetVersion get current config version.
-func (s serverConfigV10) GetVersion() string {
+func (s serverConfigV7) GetVersion() string {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Version
@@ -119,159 +114,135 @@ func (s serverConfigV10) GetVersion() string {

 /// Logger related.

-func (s *serverConfigV10) SetAMQPNotifyByID(accountID string, amqpn amqpNotify) {
+func (s *serverConfigV7) SetAMQPNotifyByID(accountID string, amqpn amqpNotify) {
 	s.rwMutex.Lock()
 	defer s.rwMutex.Unlock()
 	s.Notify.AMQP[accountID] = amqpn
 }

-func (s serverConfigV10) GetAMQP() map[string]amqpNotify {
+func (s serverConfigV7) GetAMQP() map[string]amqpNotify {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Notify.AMQP
 }

 // GetAMQPNotify get current AMQP logger.
-func (s serverConfigV10) GetAMQPNotifyByID(accountID string) amqpNotify {
+func (s serverConfigV7) GetAMQPNotifyByID(accountID string) amqpNotify {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Notify.AMQP[accountID]
 }

-//
-func (s *serverConfigV10) SetNATSNotifyByID(accountID string, natsn natsNotify) {
-	s.rwMutex.Lock()
-	defer s.rwMutex.Unlock()
-	s.Notify.NATS[accountID] = natsn
-}
-
-func (s serverConfigV10) GetNATS() map[string]natsNotify {
-	s.rwMutex.RLock()
-	defer s.rwMutex.RUnlock()
-	return s.Notify.NATS
-}
-
-// GetNATSNotify get current NATS logger.
-func (s serverConfigV10) GetNATSNotifyByID(accountID string) natsNotify {
-	s.rwMutex.RLock()
-	defer s.rwMutex.RUnlock()
-	return s.Notify.NATS[accountID]
-}
-
-func (s *serverConfigV10) SetElasticSearchNotifyByID(accountID string, esNotify elasticSearchNotify) {
+func (s *serverConfigV7) SetElasticSearchNotifyByID(accountID string, esNotify elasticSearchNotify) {
 	s.rwMutex.Lock()
 	defer s.rwMutex.Unlock()
 	s.Notify.ElasticSearch[accountID] = esNotify
 }

-func (s serverConfigV10) GetElasticSearch() map[string]elasticSearchNotify {
+func (s serverConfigV7) GetElasticSearch() map[string]elasticSearchNotify {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Notify.ElasticSearch
 }

 // GetElasticSearchNotify get current ElasicSearch logger.
-func (s serverConfigV10) GetElasticSearchNotifyByID(accountID string) elasticSearchNotify {
+func (s serverConfigV7) GetElasticSearchNotifyByID(accountID string) elasticSearchNotify {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Notify.ElasticSearch[accountID]
 }

-func (s *serverConfigV10) SetRedisNotifyByID(accountID string, rNotify redisNotify) {
+func (s *serverConfigV7) SetRedisNotifyByID(accountID string, rNotify redisNotify) {
 	s.rwMutex.Lock()
 	defer s.rwMutex.Unlock()
 	s.Notify.Redis[accountID] = rNotify
 }

-func (s serverConfigV10) GetRedis() map[string]redisNotify {
+func (s serverConfigV7) GetRedis() map[string]redisNotify {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Notify.Redis
 }

 // GetRedisNotify get current Redis logger.
-func (s serverConfigV10) GetRedisNotifyByID(accountID string) redisNotify {
+func (s serverConfigV7) GetRedisNotifyByID(accountID string) redisNotify {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Notify.Redis[accountID]
 }

-func (s *serverConfigV10) SetPostgreSQLNotifyByID(accountID string, pgn postgreSQLNotify) {
-	s.rwMutex.Lock()
-	defer s.rwMutex.Unlock()
-	s.Notify.PostgreSQL[accountID] = pgn
-}
-
-func (s serverConfigV10) GetPostgreSQL() map[string]postgreSQLNotify {
-	s.rwMutex.RLock()
-	defer s.rwMutex.RUnlock()
-	return s.Notify.PostgreSQL
-}
-
-func (s serverConfigV10) GetPostgreSQLNotifyByID(accountID string) postgreSQLNotify {
-	s.rwMutex.RLock()
-	defer s.rwMutex.RUnlock()
-	return s.Notify.PostgreSQL[accountID]
-}
-
 // SetFileLogger set new file logger.
-func (s *serverConfigV10) SetFileLogger(flogger fileLogger) {
+func (s *serverConfigV7) SetFileLogger(flogger fileLogger) {
 	s.rwMutex.Lock()
 	defer s.rwMutex.Unlock()
 	s.Logger.File = flogger
 }

 // GetFileLogger get current file logger.
-func (s serverConfigV10) GetFileLogger() fileLogger {
+func (s serverConfigV7) GetFileLogger() fileLogger {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Logger.File
 }

 // SetConsoleLogger set new console logger.
-func (s *serverConfigV10) SetConsoleLogger(clogger consoleLogger) {
+func (s *serverConfigV7) SetConsoleLogger(clogger consoleLogger) {
 	s.rwMutex.Lock()
 	defer s.rwMutex.Unlock()
 	s.Logger.Console = clogger
 }

 // GetConsoleLogger get current console logger.
-func (s serverConfigV10) GetConsoleLogger() consoleLogger {
+func (s serverConfigV7) GetConsoleLogger() consoleLogger {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Logger.Console
 }

+// SetSyslogLogger set new syslog logger.
+func (s *serverConfigV7) SetSyslogLogger(slogger syslogLogger) {
+	s.rwMutex.Lock()
+	defer s.rwMutex.Unlock()
+	s.Logger.Syslog = slogger
+}
+
+// GetSyslogLogger get current syslog logger.
+func (s *serverConfigV7) GetSyslogLogger() syslogLogger {
+	s.rwMutex.RLock()
+	defer s.rwMutex.RUnlock()
+	return s.Logger.Syslog
+}
+
 // SetRegion set new region.
-func (s *serverConfigV10) SetRegion(region string) {
+func (s *serverConfigV7) SetRegion(region string) {
 	s.rwMutex.Lock()
 	defer s.rwMutex.Unlock()
 	s.Region = region
 }

 // GetRegion get current region.
-func (s serverConfigV10) GetRegion() string {
+func (s serverConfigV7) GetRegion() string {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Region
 }

 // SetCredentials set new credentials.
-func (s *serverConfigV10) SetCredential(creds credential) {
+func (s *serverConfigV7) SetCredential(creds credential) {
 	s.rwMutex.Lock()
 	defer s.rwMutex.Unlock()
 	s.Credential = creds
 }

 // GetCredentials get current credentials.
-func (s serverConfigV10) GetCredential() credential {
+func (s serverConfigV7) GetCredential() credential {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	return s.Credential
 }

 // Save config.
-func (s serverConfigV10) Save() error {
+func (s serverConfigV7) Save() error {
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()

@@ -26,7 +26,7 @@ func TestServerConfig(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Init Test config failed")
 	}
-	// remove the root directory after the test ends.
+	// remove the root folder after the test ends.
 	defer removeAll(rootPath)

 	if serverConfig.GetRegion() != "us-east-1" {
@@ -78,6 +78,15 @@ func TestServerConfig(t *testing.T) {
 		t.Errorf("Expecting file logger config %#v found %#v", fileLogger{Enable: true}, consoleCfg)
 	}

+	// Set new syslog logger.
+	serverConfig.SetSyslogLogger(syslogLogger{
+		Enable: true,
+	})
+	sysLogCfg := serverConfig.GetSyslogLogger()
+	if !reflect.DeepEqual(sysLogCfg, syslogLogger{Enable: true}) {
+		t.Errorf("Expecting syslog logger config %#v found %#v", syslogLogger{Enable: true}, sysLogCfg)
+	}
+
 	// Match version.
 	if serverConfig.GetVersion() != globalMinioConfigVersion {
 		t.Errorf("Expecting version %s found %s", serverConfig.GetVersion(), globalMinioConfigVersion)
@@ -92,7 +101,7 @@ func TestServerConfig(t *testing.T) {
 	setGlobalConfigPath(rootPath)

 	// Initialize server config.
-	if _, err := initConfig(); err != nil {
+	if err := initConfig(); err != nil {
 		t.Fatalf("Unable to initialize from updated config file %s", err)
 	}
 }
@@ -54,9 +54,7 @@ func getConfigPath() (string, error) {
 // mustGetConfigPath must get server config path.
 func mustGetConfigPath() string {
 	configPath, err := getConfigPath()
-	if err != nil {
-		return ""
-	}
+	fatalIf(err, "Unable to get config path.")
 	return configPath
 }

@@ -71,11 +69,7 @@ func createConfigPath() error {

 // isConfigFileExists - returns true if config file exists.
 func isConfigFileExists() bool {
-	path, err := getConfigFile()
-	if err != nil {
-		return false
-	}
-	st, err := os.Stat(path)
+	st, err := os.Stat(mustGetConfigFile())
 	// If file exists and is regular return true.
 	if err == nil && st.Mode().IsRegular() {
 		return true
@@ -83,6 +77,14 @@ func isConfigFileExists() bool {
 	return false
 }

+// mustGetConfigFile must get server config file.
+func mustGetConfigFile() string {
+	configFile, err := getConfigFile()
+	fatalIf(err, "Unable to get config file.")
+
+	return configFile
+}
+
 // getConfigFile get server config file.
 func getConfigFile() (string, error) {
 	configPath, err := getConfigPath()
@@ -0,0 +1,120 @@
+/*
+ * Minio Cloud Storage, (C) 2016 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+import (
+	"fmt"
+	"net/rpc"
+	"net/url"
+	"path"
+	"strings"
+
+	"github.com/minio/cli"
+)
+
+var healCmd = cli.Command{
+	Name:   "heal",
+	Usage:  "To heal objects.",
+	Action: healControl,
+	CustomHelpTemplate: `NAME:
+  minio control {{.Name}} - {{.Usage}}
+
+USAGE:
+  minio control {{.Name}}
+
+EAMPLES:
+  1. Heal an object.
+     $ minio control {{.Name}} http://localhost:9000/songs/classical/western/piano.mp3
+
+  2. Heal all objects in a bucket recursively.
+     $ minio control {{.Name}}  http://localhost:9000/songs
+
+  3. Heall all objects with a given prefix recursively.
+     $ minio control {{.Name}} http://localhost:9000/songs/classical/
+`,
+}
+
+// "minio control heal" entry point.
+func healControl(ctx *cli.Context) {
+	// Parse bucket and object from url.URL.Path
+	parseBucketObject := func(path string) (bucketName string, objectName string) {
+		splits := strings.SplitN(path, string(slashSeparator), 3)
+		switch len(splits) {
+		case 0, 1:
+			bucketName = ""
+			objectName = ""
+		case 2:
+			bucketName = splits[1]
+			objectName = ""
+		case 3:
+			bucketName = splits[1]
+			objectName = splits[2]
+
+		}
+		return bucketName, objectName
+	}
+
+	if len(ctx.Args()) != 1 {
+		cli.ShowCommandHelpAndExit(ctx, "heal", 1)
+	}
+
+	parsedURL, err := url.Parse(ctx.Args()[0])
+	fatalIf(err, "Unable to parse URL")
+
+	bucketName, objectName := parseBucketObject(parsedURL.Path)
+	if bucketName == "" {
+		cli.ShowCommandHelpAndExit(ctx, "heal", 1)
+	}
+
+	client, err := rpc.DialHTTPPath("tcp", parsedURL.Host, path.Join(reservedBucket, controlPath))
+	fatalIf(err, "Unable to connect to %s", parsedURL.Host)
+
+	// If object does not have trailing "/" then it's an object, hence heal it.
+	if objectName != "" && !strings.HasSuffix(objectName, slashSeparator) {
+		fmt.Printf("Healing : /%s/%s", bucketName, objectName)
+		args := &HealObjectArgs{bucketName, objectName}
+		reply := &HealObjectReply{}
+		err = client.Call("Control.HealObject", args, reply)
+		fatalIf(err, "RPC Control.HealObject call failed")
+		fmt.Println()
+		return
+	}
+
+	// Recursively list and heal the objects.
+	prefix := objectName
+	marker := ""
+	for {
+		args := HealListArgs{bucketName, prefix, marker, "", 1000}
+		reply := &HealListReply{}
+		err = client.Call("Control.ListObjectsHeal", args, reply)
+		fatalIf(err, "RPC Heal.ListObjects call failed")
+
+		// Heal the objects returned in the ListObjects reply.
+		for _, obj := range reply.Objects {
+			fmt.Printf("Healing : /%s/%s", bucketName, obj)
+			reply := &HealObjectReply{}
+			err = client.Call("Control.HealObject", HealObjectArgs{bucketName, obj}, reply)
+			fatalIf(err, "RPC Heal.HealObject call failed")
+			fmt.Println()
+		}
+		if !reply.IsTruncated {
+			// End of listing.
+			break
+		}
+		marker = reply.NextMarker
+	}
+}
@@ -0,0 +1,52 @@
+/*
+ * Minio Cloud Storage, (C) 2016 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+import "github.com/minio/cli"
+
+// "minio control" command.
+var controlCmd = cli.Command{
+	Name:   "control",
+	Usage:  "Control and manage minio server.",
+	Action: mainControl,
+	Subcommands: []cli.Command{
+		healCmd,
+		shutdownCmd,
+	},
+	CustomHelpTemplate: `NAME:
+   {{.Name}} - {{.Usage}}
+
+USAGE:
+   {{.Name}} [FLAGS] COMMAND
+
+FLAGS:
+  {{range .Flags}}{{.}}
+  {{end}}
+COMMANDS:
+   {{range .Commands}}{{join .Names ", "}}{{ "\t" }}{{.Usage}}
+   {{end}}
+`,
+}
+
+func mainControl(ctx *cli.Context) {
+	if ctx.Args().First() != "" { // command help.
+		cli.ShowCommandHelp(ctx, ctx.Args().First())
+	} else {
+		// command with Subcommands is an App.
+		cli.ShowAppHelp(ctx)
+	}
+}
@@ -0,0 +1,68 @@
+/*
+ * Minio Cloud Storage, (C) 2016 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+import (
+	"net/rpc"
+	"net/url"
+	"path"
+
+	"github.com/minio/cli"
+)
+
+var shutdownCmd = cli.Command{
+	Name:   "shutdown",
+	Usage:  "Shutdown or restart the server.",
+	Action: shutdownControl,
+	Flags: []cli.Flag{
+		cli.BoolFlag{
+			Name:  "restart",
+			Usage: "Restart the server.",
+		},
+	},
+	CustomHelpTemplate: `NAME:
+  minio control {{.Name}} - {{.Usage}}
+
+USAGE:
+  minio control {{.Name}} http://localhost:9000/
+
+EAMPLES:
+  1. Shutdown the server:
+    $ minio control shutdown http://localhost:9000/
+
+  2. Reboot the server:
+    $ minio control shutdown --restart http://localhost:9000/
+`,
+}
+
+// "minio control shutdown" entry point.
+func shutdownControl(c *cli.Context) {
+	if len(c.Args()) != 1 {
+		cli.ShowCommandHelpAndExit(c, "shutdown", 1)
+	}
+
+	parsedURL, err := url.ParseRequestURI(c.Args()[0])
+	fatalIf(err, "Unable to parse URL")
+
+	client, err := rpc.DialHTTPPath("tcp", parsedURL.Host, path.Join(reservedBucket, controlPath))
+	fatalIf(err, "Unable to connect to %s", parsedURL.Host)
+
+	args := &ShutdownArgs{Reboot: c.Bool("restart")}
+	reply := &ShutdownReply{}
+	err = client.Call("Control.Shutdown", args, reply)
+	fatalIf(err, "RPC Control.Shutdown call failed")
+}
@@ -0,0 +1,88 @@
+/*
+ * Minio Cloud Storage, (C) 2016 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+// HealListArgs - argument for ListObjects RPC.
+type HealListArgs struct {
+	Bucket    string
+	Prefix    string
+	Marker    string
+	Delimiter string
+	MaxKeys   int
+}
+
+// HealListReply - reply by ListObjects RPC.
+type HealListReply struct {
+	IsTruncated bool
+	NextMarker  string
+	Objects     []string
+}
+
+// ListObjects - list all objects that needs healing.
+func (c *controllerAPIHandlers) ListObjectsHeal(arg *HealListArgs, reply *HealListReply) error {
+	objAPI := c.ObjectAPI
+	if objAPI == nil {
+		return errInvalidArgument
+	}
+	info, err := objAPI.ListObjectsHeal(arg.Bucket, arg.Prefix, arg.Marker, arg.Delimiter, arg.MaxKeys)
+	if err != nil {
+		return err
+	}
+	reply.IsTruncated = info.IsTruncated
+	reply.NextMarker = info.NextMarker
+	for _, obj := range info.Objects {
+		reply.Objects = append(reply.Objects, obj.Name)
+	}
+	return nil
+}
+
+// HealObjectArgs - argument for HealObject RPC.
+type HealObjectArgs struct {
+	Bucket string
+	Object string
+}
+
+// HealObjectReply - reply by HealObject RPC.
+type HealObjectReply struct{}
+
+// HealObject - heal the object.
+func (c *controllerAPIHandlers) HealObject(arg *HealObjectArgs, reply *HealObjectReply) error {
+	objAPI := c.ObjectAPI
+	if objAPI == nil {
+		return errInvalidArgument
+	}
+	return objAPI.HealObject(arg.Bucket, arg.Object)
+}
+
+// ShutdownArgs - argument for Shutdown RPC.
+type ShutdownArgs struct {
+	Reboot bool
+}
+
+// ShutdownReply - reply by Shutdown RPC.
+type ShutdownReply struct{}
+
+// Shutdown - Shutdown the server.
+
+func (c *controllerAPIHandlers) Shutdown(arg *ShutdownArgs, reply *ShutdownReply) error {
+	if arg.Reboot {
+		globalShutdownSignalCh <- shutdownRestart
+	} else {
+		globalShutdownSignalCh <- shutdownHalt
+	}
+	return nil
+}
@@ -1,5 +1,5 @@
 /*
- * Minio Cloud Storage, (C) 2014-2016 Minio, Inc.
+ * Minio Cloud Storage, (C) 2016 Minio, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,28 +22,21 @@ import (
 	router "github.com/gorilla/mux"
 )

+// Routes paths for "minio control" commands.
 const (
-	s3Path = "/s3/remote"
+	controlPath = "/controller"
 )

-type s3PeerAPIHandlers struct {
-	bms BucketMetaState
+// Register control RPC handlers.
+func registerControlRPCRouter(mux *router.Router, ctrlHandlers *controllerAPIHandlers) {
+	ctrlRPCServer := rpc.NewServer()
+	ctrlRPCServer.RegisterName("Control", ctrlHandlers)
+
+	ctrlRouter := mux.NewRoute().PathPrefix(reservedBucket).Subrouter()
+	ctrlRouter.Path(controlPath).Handler(ctrlRPCServer)
 }

-func registerS3PeerRPCRouter(mux *router.Router) error {
-	s3PeerHandlers := &s3PeerAPIHandlers{
-		&localBucketMetaState{
-			ObjectAPI: newObjectLayerFn,
-		},
-	}
-
-	s3PeerRPCServer := rpc.NewServer()
-	err := s3PeerRPCServer.RegisterName("S3", s3PeerHandlers)
-	if err != nil {
-		return traceError(err)
-	}
-
-	s3PeerRouter := mux.NewRoute().PathPrefix(reservedBucket).Subrouter()
-	s3PeerRouter.Path(s3Path).Handler(s3PeerRPCServer)
-	return nil
+// Handler for object healing.
+type controllerAPIHandlers struct {
+	ObjectAPI ObjectLayer
 }
@@ -19,7 +19,7 @@ package cmd
 import "net/http"

 // Standard cross domain policy information located at https://s3.amazonaws.com/crossdomain.xml
-const crossDomainXML = `<?xml version="1.0"?><!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"><cross-domain-policy><allow-access-from domain="*" secure="false" /></cross-domain-policy>`
+var crossDomainXML = `<?xml version="1.0"?><!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"><cross-domain-policy><allow-access-from domain="*" secure="false" /></cross-domain-policy>`

 // Cross domain policy implements http.Handler interface, implementing a custom ServerHTTP.
 type crossDomainPolicy struct {
@@ -44,9 +44,9 @@ func DamerauLevenshteinDistance(a string, b string) int {
 	for j := 0; j <= len(b); j++ {
 		d[0][j] = j
 	}
-	var cost int
 	for i := 1; i <= len(a); i++ {
 		for j := 1; j <= len(b); j++ {
+			cost := 0
 			if a[i-1] == b[j-1] {
 				cost = 0
 			} else {
@@ -41,7 +41,7 @@ func erasureCreateFile(disks []StorageAPI, volume, path string, reader io.Reader
 		// FIXME: this is a bug in Golang, n == 0 and err ==
 		// io.ErrUnexpectedEOF for io.ReadFull function.
 		if n == 0 && rErr == io.ErrUnexpectedEOF {
-			return 0, nil, traceError(rErr)
+			return 0, nil, rErr
 		}
 		if rErr == io.EOF {
 			// We have reached EOF on the first byte read, io.Reader
@@ -58,7 +58,7 @@ func erasureCreateFile(disks []StorageAPI, volume, path string, reader io.Reader
 			break
 		}
 		if rErr != nil && rErr != io.ErrUnexpectedEOF {
-			return 0, nil, traceError(rErr)
+			return 0, nil, rErr
 		}
 		if n > 0 {
 			// Returns encoded blocks.
@@ -88,19 +88,19 @@ func erasureCreateFile(disks []StorageAPI, volume, path string, reader io.Reader
 func encodeData(dataBuffer []byte, dataBlocks, parityBlocks int) ([][]byte, error) {
 	rs, err := reedsolomon.New(dataBlocks, parityBlocks)
 	if err != nil {
-		return nil, traceError(err)
+		return nil, err
 	}
 	// Split the input buffer into data and parity blocks.
 	var blocks [][]byte
 	blocks, err = rs.Split(dataBuffer)
 	if err != nil {
-		return nil, traceError(err)
+		return nil, err
 	}

 	// Encode parity blocks using data blocks.
 	err = rs.Encode(blocks)
 	if err != nil {
-		return nil, traceError(err)
+		return nil, err
 	}

 	// Return encoded blocks.
@@ -122,7 +122,7 @@ func appendFile(disks []StorageAPI, volume, path string, enBlocks [][]byte, hash
 			defer wg.Done()
 			wErr := disk.AppendFile(volume, path, enBlocks[index])
 			if wErr != nil {
-				wErrs[index] = traceError(wErr)
+				wErrs[index] = wErr
 				return
 			}

@@ -139,7 +139,7 @@ func appendFile(disks []StorageAPI, volume, path string, enBlocks [][]byte, hash

 	// Do we have write quorum?.
 	if !isDiskQuorum(wErrs, writeQuorum) {
-		return traceError(errXLWriteQuorum)
+		return errXLWriteQuorum
 	}
-	return reduceWriteQuorumErrs(wErrs, objectOpIgnoredErrs, writeQuorum)
+	return nil
 }
@@ -21,7 +21,6 @@ import (
 	"crypto/rand"
 	"testing"

-	humanize "github.com/dustin/go-humanize"
 	"github.com/klauspost/reedsolomon"
 )

@@ -49,8 +48,8 @@ func TestErasureCreateFile(t *testing.T) {

 	disks := setup.disks

-	// Prepare a slice of 1MiB with random data.
-	data := make([]byte, 1*humanize.MiByte)
+	// Prepare a slice of 1MB with random data.
+	data := make([]byte, 1*1024*1024)
 	_, err = rand.Read(data)
 	if err != nil {
 		t.Fatal(err)
@@ -94,8 +93,8 @@ func TestErasureCreateFile(t *testing.T) {
 	// 1 more disk down. 7 disk down in total. Should return quorum error.
 	disks[10] = AppendDiskDown{disks[10].(*posix)}
 	_, _, err = erasureCreateFile(disks, "testbucket", "testobject4", bytes.NewReader(data), blockSize, dataBlocks, parityBlocks, bitRotAlgo, dataBlocks+1)
-	if errorCause(err) != errXLWriteQuorum {
-		t.Errorf("erasureCreateFile return value: expected errXLWriteQuorum, got %s", err)
+	if err != errXLWriteQuorum {
+		t.Errorf("erasureCreateFile returned expected errXLWriteQuorum error, got %s", err)
 	}
 }

@@ -196,7 +195,7 @@ func TestErasureEncode(t *testing.T) {
 		}
 		// Failed as expected, but does it fail for the expected reason.
 		if actualErr != nil && !testCase.shouldPass {
-			if errorCause(actualErr) != testCase.expectedErr {
+			if testCase.expectedErr != actualErr {
 				t.Errorf("Test %d: Expected Error to be \"%v\", but instead found \"%v\" ", i+1, testCase.expectedErr, actualErr)
 			}
 		}
@@ -64,7 +64,7 @@ func erasureHealFile(latestDisks []StorageAPI, outDatedDisks []StorageAPI, volum
 			}
 			err := disk.AppendFile(healBucket, healPath, enBlocks[index])
 			if err != nil {
-				return nil, traceError(err)
+				return nil, err
 			}
 			hashWriters[index].Write(enBlocks[index])
 		}
@@ -22,8 +22,6 @@ import (
 	"os"
 	"path"
 	"testing"
-
-	humanize "github.com/dustin/go-humanize"
 )

 // Test erasureHealFile()
@@ -41,8 +39,8 @@ func TestErasureHealFile(t *testing.T) {

 	disks := setup.disks

-	// Prepare a slice of 1MiB with random data.
-	data := make([]byte, 1*humanize.MiByte)
+	// Prepare a slice of 1MB with random data.
+	data := make([]byte, 1*1024*1024)
 	_, err = rand.Read(data)
 	if err != nil {
 		t.Fatal(err)
@@ -68,11 +66,7 @@ func TestErasureHealFile(t *testing.T) {
 	copy(latest, disks)
 	latest[0] = nil
 	outDated[0] = disks[0]
-
-	healCheckSums, err := erasureHealFile(latest, outDated, "testbucket", "testobject1", "testbucket", "testobject1", 1*humanize.MiByte, blockSize, dataBlocks, parityBlocks, bitRotAlgo)
-	if err != nil {
-		t.Fatal(err)
-	}
+	healCheckSums, err := erasureHealFile(latest, outDated, "testbucket", "testobject1", "testbucket", "testobject1", 1*1024*1024, blockSize, dataBlocks, parityBlocks, bitRotAlgo)
 	// Checksum of the healed file should match.
 	if checkSums[0] != healCheckSums[0] {
 		t.Error("Healing failed, data does not match.")
@@ -92,7 +86,7 @@ func TestErasureHealFile(t *testing.T) {
 		outDated[index] = disks[index]
 	}

-	healCheckSums, err = erasureHealFile(latest, outDated, "testbucket", "testobject1", "testbucket", "testobject1", 1*humanize.MiByte, blockSize, dataBlocks, parityBlocks, bitRotAlgo)
+	healCheckSums, err = erasureHealFile(latest, outDated, "testbucket", "testobject1", "testbucket", "testobject1", 1*1024*1024, blockSize, dataBlocks, parityBlocks, bitRotAlgo)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -122,7 +116,7 @@ func TestErasureHealFile(t *testing.T) {
 		latest[index] = nil
 		outDated[index] = disks[index]
 	}
-	_, err = erasureHealFile(latest, outDated, "testbucket", "testobject1", "testbucket", "testobject1", 1*humanize.MiByte, blockSize, dataBlocks, parityBlocks, bitRotAlgo)
+	healCheckSums, err = erasureHealFile(latest, outDated, "testbucket", "testobject1", "testbucket", "testobject1", 1*1024*1024, blockSize, dataBlocks, parityBlocks, bitRotAlgo)
 	if err == nil {
 		t.Error("Expected erasureHealFile() to fail when the number of available disks <= parityBlocks")
 	}
@@ -84,10 +84,10 @@ func getReadDisks(orderedDisks []StorageAPI, index int, dataBlocks int) (readDis

 	// Sanity checks - we should never have this situation.
 	if dataDisks == dataBlocks {
-		return nil, 0, traceError(errUnexpected)
+		return nil, 0, errUnexpected
 	}
 	if dataDisks+parityDisks >= dataBlocks {
-		return nil, 0, traceError(errUnexpected)
+		return nil, 0, errUnexpected
 	}

 	// Find the disks from which next set of parallel reads should happen.
@@ -107,7 +107,7 @@ func getReadDisks(orderedDisks []StorageAPI, index int, dataBlocks int) (readDis
 			return readDisks, i + 1, nil
 		}
 	}
-	return nil, 0, traceError(errXLReadQuorum)
+	return nil, 0, errXLReadQuorum
 }

 // parallelRead - reads chunks in parallel from the disks specified in []readDisks.
@@ -161,12 +161,12 @@ func parallelRead(volume, path string, readDisks []StorageAPI, orderedDisks []St
 func erasureReadFile(writer io.Writer, disks []StorageAPI, volume string, path string, offset int64, length int64, totalLength int64, blockSize int64, dataBlocks int, parityBlocks int, checkSums []string, algo string, pool *bpool.BytePool) (int64, error) {
 	// Offset and length cannot be negative.
 	if offset < 0 || length < 0 {
-		return 0, traceError(errUnexpected)
+		return 0, errUnexpected
 	}

 	// Can't request more data than what is available.
 	if offset+length > totalLength {
-		return 0, traceError(errUnexpected)
+		return 0, errUnexpected
 	}

 	// chunkSize is the amount of data that needs to be read from each disk at a time.
@@ -248,7 +248,7 @@ func erasureReadFile(writer io.Writer, disks []StorageAPI, volume string, path s
 			}
 			if nextIndex == len(disks) {
 				// No more disks to read from.
-				return bytesWritten, traceError(errXLReadQuorum)
+				return bytesWritten, errXLReadQuorum
 			}
 			// We do not have enough enough data blocks to reconstruct the data
 			// hence continue the for-loop till we have enough data blocks.
@@ -325,24 +325,24 @@ func decodeData(enBlocks [][]byte, dataBlocks, parityBlocks int) error {
 	// Initialized reedsolomon.
 	rs, err := reedsolomon.New(dataBlocks, parityBlocks)
 	if err != nil {
-		return traceError(err)
+		return err
 	}

 	// Reconstruct encoded blocks.
 	err = rs.Reconstruct(enBlocks)
 	if err != nil {
-		return traceError(err)
+		return err
 	}

 	// Verify reconstructed blocks (parity).
 	ok, err := rs.Verify(enBlocks)
 	if err != nil {
-		return traceError(err)
+		return err
 	}
 	if !ok {
 		// Blocks cannot be reconstructed, corrupted data.
-		err = errors.New("Verification failed after reconstruction, data likely corrupted")
-		return traceError(err)
+		err = errors.New("Verification failed after reconstruction, data likely corrupted.")
+		return err
 	}

 	// Success.
@@ -22,15 +22,13 @@ import (
 	"testing"
 	"time"

-	"reflect"
-
-	humanize "github.com/dustin/go-humanize"
 	"github.com/minio/minio/pkg/bpool"
 )
+import "reflect"

 // Tests getReadDisks which returns readable disks slice from which we can
 // read parallelly.
-func testGetReadDisks(t *testing.T, xl *xlObjects) {
+func testGetReadDisks(t *testing.T, xl xlObjects) {
 	d := xl.storageDisks
 	testCases := []struct {
 		index     int          // index argument for getReadDisks
@@ -106,7 +104,7 @@ func testGetReadDisks(t *testing.T, xl *xlObjects) {

 	for i, test := range testCases {
 		disks, nextIndex, err := getReadDisks(test.argDisks, test.index, xl.dataBlocks)
-		if errorCause(err) != test.err {
+		if err != test.err {
 			t.Errorf("test-case %d - expected error : %s, got : %s", i+1, test.err, err)
 			continue
 		}
@@ -123,7 +121,7 @@ func testGetReadDisks(t *testing.T, xl *xlObjects) {

 // Test getOrderedDisks which returns ordered slice of disks from their
 // actual distribution.
-func testGetOrderedDisks(t *testing.T, xl *xlObjects) {
+func testGetOrderedDisks(t *testing.T, xl xlObjects) {
 	disks := xl.storageDisks
 	distribution := []int{16, 14, 12, 10, 8, 6, 4, 2, 1, 3, 5, 7, 9, 11, 13, 15}
 	orderedDisks := getOrderedDisks(distribution, disks)
@@ -219,22 +217,12 @@ func TestIsSuccessBlocks(t *testing.T) {

 // Wrapper function for testGetReadDisks, testGetOrderedDisks.
 func TestErasureReadUtils(t *testing.T) {
-	nDisks := 16
-	disks, err := getRandomDisks(nDisks)
+	objLayer, dirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	endpoints, err := parseStorageEndpoints(disks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	objLayer, _, err := initObjectLayer(endpoints)
-	if err != nil {
-		removeRoots(disks)
-		t.Fatal(err)
-	}
-	defer removeRoots(disks)
-	xl := objLayer.(*xlObjects)
+	defer removeRoots(dirs)
+	xl := objLayer.(xlObjects)
 	testGetReadDisks(t, xl)
 	testGetOrderedDisks(t, xl)
 }
@@ -262,8 +250,8 @@ func TestErasureReadFileDiskFail(t *testing.T) {

 	disks := setup.disks

-	// Prepare a slice of 1humanize.MiByte with random data.
-	data := make([]byte, 1*humanize.MiByte)
+	// Prepare a slice of 1MB with random data.
+	data := make([]byte, 1*1024*1024)
 	length := int64(len(data))
 	_, err = rand.Read(data)
 	if err != nil {
@@ -326,7 +314,7 @@ func TestErasureReadFileDiskFail(t *testing.T) {
 	disks[13] = ReadDiskDown{disks[13].(*posix)}
 	buf.Reset()
 	_, err = erasureReadFile(buf, disks, "testbucket", "testobject", 0, length, length, blockSize, dataBlocks, parityBlocks, checkSums, bitRotAlgo, pool)
-	if errorCause(err) != errXLReadQuorum {
+	if err != errXLReadQuorum {
 		t.Fatal("expected errXLReadQuorum error")
 	}
 }
@@ -335,7 +323,7 @@ func TestErasureReadFileOffsetLength(t *testing.T) {
 	// Initialize environment needed for the test.
 	dataBlocks := 7
 	parityBlocks := 7
-	blockSize := int64(1 * humanize.MiByte)
+	blockSize := int64(1 * 1024 * 1024)
 	setup, err := newErasureTestSetup(dataBlocks, parityBlocks, blockSize)
 	if err != nil {
 		t.Error(err)
@@ -345,8 +333,8 @@ func TestErasureReadFileOffsetLength(t *testing.T) {

 	disks := setup.disks

-	// Prepare a slice of 5humanize.MiByte with random data.
-	data := make([]byte, 5*humanize.MiByte)
+	// Prepare a slice of 5MB with random data.
+	data := make([]byte, 5*1024*1024)
 	length := int64(len(data))
 	_, err = rand.Read(data)
 	if err != nil {
@@ -411,7 +399,7 @@ func TestErasureReadFileRandomOffsetLength(t *testing.T) {
 	// Initialize environment needed for the test.
 	dataBlocks := 7
 	parityBlocks := 7
-	blockSize := int64(1 * humanize.MiByte)
+	blockSize := int64(1 * 1024 * 1024)
 	setup, err := newErasureTestSetup(dataBlocks, parityBlocks, blockSize)
 	if err != nil {
 		t.Error(err)
@@ -421,8 +409,8 @@ func TestErasureReadFileRandomOffsetLength(t *testing.T) {

 	disks := setup.disks

-	// Prepare a slice of 5MiB with random data.
-	data := make([]byte, 5*humanize.MiByte)
+	// Prepare a slice of 5MB with random data.
+	data := make([]byte, 5*1024*1024)
 	length := int64(len(data))
 	_, err = rand.Read(data)
 	if err != nil {
@@ -442,7 +430,7 @@ func TestErasureReadFileRandomOffsetLength(t *testing.T) {
 	}

 	// To generate random offset/length.
-	r := rand.New(rand.NewSource(time.Now().UTC().UnixNano()))
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))

 	// create pool buffer which will be used by erasureReadFile for
 	// reading from disks and erasure decoding.
@@ -21,6 +21,7 @@ import (
 	"errors"
 	"hash"
 	"io"
+	"sync"

 	"github.com/klauspost/reedsolomon"
 	"github.com/minio/blake2b-simd"
@@ -47,13 +48,23 @@ func newHash(algo string) hash.Hash {
 	}
 }

+var hashBufPool = sync.Pool{
+	New: func() interface{} {
+		b := make([]byte, readSizeV1)
+		return &b
+	},
+}
+
 // hashSum calculates the hash of the entire path and returns.
 func hashSum(disk StorageAPI, volume, path string, writer hash.Hash) ([]byte, error) {
-	// Allocate staging buffer of 128KiB for copyBuffer.
-	buf := make([]byte, readSizeV1)
+	// Allocate staging buffer of 2MiB for copyBuffer.
+	bufp := hashBufPool.Get().(*[]byte)
+
+	// Reuse buffer.
+	defer hashBufPool.Put(bufp)

 	// Copy entire buffer to writer.
-	if err := copyBuffer(writer, disk, volume, path, buf); err != nil {
+	if err := copyBuffer(writer, disk, volume, path, *bufp); err != nil {
 		return nil, err
 	}

@@ -76,17 +87,17 @@ func getDataBlockLen(enBlocks [][]byte, dataBlocks int) int {
 func writeDataBlocks(dst io.Writer, enBlocks [][]byte, dataBlocks int, offset int64, length int64) (int64, error) {
 	// Offset and out size cannot be negative.
 	if offset < 0 || length < 0 {
-		return 0, traceError(errUnexpected)
+		return 0, errUnexpected
 	}

 	// Do we have enough blocks?
 	if len(enBlocks) < dataBlocks {
-		return 0, traceError(reedsolomon.ErrTooFewShards)
+		return 0, reedsolomon.ErrTooFewShards
 	}

 	// Do we have enough data?
 	if int64(getDataBlockLen(enBlocks, dataBlocks)) < length {
-		return 0, traceError(reedsolomon.ErrShortData)
+		return 0, reedsolomon.ErrShortData
 	}

 	// Counter to decrement total left to write.
@@ -114,7 +125,7 @@ func writeDataBlocks(dst io.Writer, enBlocks [][]byte, dataBlocks int, offset in
 		if write < int64(len(block)) {
 			n, err := io.Copy(dst, bytes.NewReader(block[:write]))
 			if err != nil {
-				return 0, traceError(err)
+				return 0, err
 			}
 			totalWritten += n
 			break
@@ -122,7 +133,7 @@ func writeDataBlocks(dst io.Writer, enBlocks [][]byte, dataBlocks int, offset in
 		// Copy the block.
 		n, err := io.Copy(dst, bytes.NewReader(block))
 		if err != nil {
-			return 0, traceError(err)
+			return 0, err
 		}

 		// Decrement output size.
@@ -1,122 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-)
-
-// Holds the current directory path. Used for trimming path in traceError()
-var rootPath string
-
-// Figure out the rootPath
-func initError() {
-	// Root path is automatically determined from the calling function's source file location.
-	// Catch the calling function's source file path.
-	_, file, _, _ := runtime.Caller(1)
-	// Save the directory alone.
-	rootPath = filepath.Dir(file)
-}
-
-// Represents a stack frame in the stack trace.
-type traceInfo struct {
-	file string // File where error occurred
-	line int    // Line where error occurred
-	name string // Name of the function where error occurred
-}
-
-// Error - error type containing cause and the stack trace.
-type Error struct {
-	e     error       // Holds the cause error
-	trace []traceInfo // stack trace
-	errs  []error     // Useful for XL to hold errors from all disks
-}
-
-// Implement error interface.
-func (e Error) Error() string {
-	return e.e.Error()
-}
-
-// Trace - returns stack trace.
-func (e Error) Trace() []string {
-	var traceArr []string
-	for _, info := range e.trace {
-		traceArr = append(traceArr, fmt.Sprintf("%s:%d:%s",
-			info.file, info.line, info.name))
-	}
-	return traceArr
-}
-
-// NewStorageError - return new Error type.
-func traceError(e error, errs ...error) error {
-	if e == nil {
-		return nil
-	}
-	err := &Error{}
-	err.e = e
-	err.errs = errs
-
-	stack := make([]uintptr, 40)
-	length := runtime.Callers(2, stack)
-	if length > len(stack) {
-		length = len(stack)
-	}
-	stack = stack[:length]
-
-	for _, pc := range stack {
-		pc = pc - 1
-		fn := runtime.FuncForPC(pc)
-		file, line := fn.FileLine(pc)
-		name := fn.Name()
-		if strings.HasSuffix(name, "ServeHTTP") {
-			break
-		}
-		if strings.HasSuffix(name, "runtime.") {
-			break
-		}
-
-		file = strings.TrimPrefix(file, rootPath+string(os.PathSeparator))
-		name = strings.TrimPrefix(name, "github.com/minio/minio/cmd.")
-		err.trace = append(err.trace, traceInfo{file, line, name})
-	}
-
-	return err
-}
-
-// Returns the underlying cause error.
-func errorCause(err error) error {
-	if e, ok := err.(*Error); ok {
-		err = e.e
-	}
-	return err
-}
-
-// Returns slice of underlying cause error.
-func errorsCause(errs []error) []error {
-	cerrs := make([]error, len(errs))
-	for i, err := range errs {
-		if err == nil {
-			continue
-		}
-		cerrs[i] = errorCause(err)
-	}
-	return cerrs
-}
@@ -18,10 +18,8 @@ package cmd

 import (
 	"bytes"
-	"encoding/json"
 	"encoding/xml"
 	"fmt"
-	"net"
 	"net/url"
 	"path"
 	"sync"
@@ -30,51 +28,14 @@ import (
 	"github.com/Sirupsen/logrus"
 )

-type externalNotifier struct {
-	// Per-bucket notification config. This is updated via
-	// PutBucketNotification API.
-	notificationConfigs map[string]*notificationConfig
-
-	// An external target keeps a connection to an external
-	// service to which events are to be sent. It is a mapping
-	// from an ARN to a log object
-	targets map[string]*logrus.Logger
-
-	rwMutex *sync.RWMutex
-}
-
-type internalNotifier struct {
-	// per-bucket listener configuration. This is updated
-	// when listeners connect or disconnect.
-	listenerConfigs map[string][]listenerConfig
-
-	// An internal target is a peer Minio server, that is
-	// connected to a listening client. Here, targets is a map of
-	// listener ARN to log object.
-	targets map[string]*listenerLogger
-
-	// Connected listeners is a map of listener ARNs to channels
-	// on which the ListenBucket API handler go routine is waiting
-	// for events to send to a client.
-	connectedListeners map[string]chan []NotificationEvent
-
-	rwMutex *sync.RWMutex
-}
-
-// Global event notification configuration. This structure has state
-// about configured external notifications, and run-time configuration
-// for listener notifications.
+// Global event notification queue. This is the queue that would be used to send all notifications.
 type eventNotifier struct {
+	rwMutex *sync.RWMutex

-	// `external` here refers to notification configuration to
-	// send events to supported external systems
-	external externalNotifier
-
-	// `internal` refers to notification configuration for live
-	// listening clients. Events for a client are send from all
-	// servers, internally to a particular server that is
-	// connected to the client.
-	internal internalNotifier
+	// Collection of 'bucket' and notification config.
+	notificationConfigs map[string]*notificationConfig
+	snsTargets          map[string][]chan []NotificationEvent
+	queueTargets        map[string]*logrus.Logger
 }

 // Represents data to be sent with notification event.
@@ -92,8 +53,7 @@ func newNotificationEvent(event eventData) NotificationEvent {
 	region := serverConfig.GetRegion()
 	tnow := time.Now().UTC()
 	sequencer := fmt.Sprintf("%X", tnow.UnixNano())
-	// Following blocks fills in all the necessary details of s3
-	// event message structure.
+	// Following blocks fills in all the necessary details of s3 event message structure.
 	// http://docs.aws.amazon.com/AmazonS3/latest/dev/notification-content-structure.html
 	nEvent := NotificationEvent{
 		EventVersion:      "2.0",
@@ -135,143 +95,79 @@ func newNotificationEvent(event eventData) NotificationEvent {
 	return nEvent
 }

-// Fetch the external target. No locking needed here since this map is
-// never written after initial startup.
-func (en eventNotifier) GetExternalTarget(queueARN string) *logrus.Logger {
-	return en.external.targets[queueARN]
+// Fetch the saved queue target.
+func (en eventNotifier) GetQueueTarget(queueARN string) *logrus.Logger {
+	return en.queueTargets[queueARN]
 }

-func (en eventNotifier) GetInternalTarget(arn string) *listenerLogger {
-	en.internal.rwMutex.RLock()
-	defer en.internal.rwMutex.RUnlock()
-	return en.internal.targets[arn]
+func (en eventNotifier) GetSNSTarget(snsARN string) []chan []NotificationEvent {
+	en.rwMutex.RLock()
+	defer en.rwMutex.RUnlock()
+	return en.snsTargets[snsARN]
 }

 // Set a new sns target for an input sns ARN.
-func (en *eventNotifier) AddListenerChan(snsARN string, listenerCh chan []NotificationEvent) error {
+func (en *eventNotifier) SetSNSTarget(snsARN string, listenerCh chan []NotificationEvent) error {
+	en.rwMutex.Lock()
+	defer en.rwMutex.Unlock()
 	if listenerCh == nil {
 		return errInvalidArgument
 	}
-	en.internal.rwMutex.Lock()
-	defer en.internal.rwMutex.Unlock()
-	en.internal.connectedListeners[snsARN] = listenerCh
+	en.snsTargets[snsARN] = append(en.snsTargets[snsARN], listenerCh)
 	return nil
 }

 // Remove sns target for an input sns ARN.
-func (en *eventNotifier) RemoveListenerChan(snsARN string) {
-	en.internal.rwMutex.Lock()
-	defer en.internal.rwMutex.Unlock()
-	if en.internal.connectedListeners != nil {
-		delete(en.internal.connectedListeners, snsARN)
+func (en *eventNotifier) RemoveSNSTarget(snsARN string, listenerCh chan []NotificationEvent) {
+	en.rwMutex.Lock()
+	defer en.rwMutex.Unlock()
+	snsTarget, ok := en.snsTargets[snsARN]
+	if ok {
+		for i, savedListenerCh := range snsTarget {
+			if listenerCh == savedListenerCh {
+				snsTarget = append(snsTarget[:i], snsTarget[i+1:]...)
+				if len(snsTarget) == 0 {
+					delete(en.snsTargets, snsARN)
+					break
+				}
+				en.snsTargets[snsARN] = snsTarget
+			}
+		}
 	}
 }

-func (en *eventNotifier) SendListenerEvent(arn string, event []NotificationEvent) error {
-	en.internal.rwMutex.Lock()
-	defer en.internal.rwMutex.Unlock()
-
-	ch, ok := en.internal.connectedListeners[arn]
-	if ok {
-		ch <- event
+// Returns true if bucket notification is set for the bucket, false otherwise.
+func (en *eventNotifier) IsBucketNotificationSet(bucket string) bool {
+	if en == nil {
+		return false
 	}
-	// If the channel is not present we ignore the event.
-	return nil
+	en.rwMutex.RLock()
+	defer en.rwMutex.RUnlock()
+	_, ok := en.notificationConfigs[bucket]
+	return ok
 }

 // Fetch bucket notification config for an input bucket.
 func (en eventNotifier) GetBucketNotificationConfig(bucket string) *notificationConfig {
-	en.external.rwMutex.RLock()
-	defer en.external.rwMutex.RUnlock()
-	return en.external.notificationConfigs[bucket]
+	en.rwMutex.RLock()
+	defer en.rwMutex.RUnlock()
+	return en.notificationConfigs[bucket]
 }

-func (en *eventNotifier) SetBucketNotificationConfig(bucket string, ncfg *notificationConfig) {
-	en.external.rwMutex.Lock()
-	if ncfg == nil {
-		delete(en.external.notificationConfigs, bucket)
-	} else {
-		en.external.notificationConfigs[bucket] = ncfg
-	}
-	en.external.rwMutex.Unlock()
-}
-
-func (en *eventNotifier) GetBucketListenerConfig(bucket string) []listenerConfig {
-	en.internal.rwMutex.RLock()
-	defer en.internal.rwMutex.RUnlock()
-	return en.internal.listenerConfigs[bucket]
-}
-
-func (en *eventNotifier) SetBucketListenerConfig(bucket string, lcfg []listenerConfig) error {
-	en.internal.rwMutex.Lock()
-	defer en.internal.rwMutex.Unlock()
-	if len(lcfg) == 0 {
-		delete(en.internal.listenerConfigs, bucket)
-	} else {
-		en.internal.listenerConfigs[bucket] = lcfg
-	}
-	for _, elcArr := range en.internal.listenerConfigs {
-		for _, elcElem := range elcArr {
-			currArn := elcElem.TopicConfig.TopicARN
-			logger, err := newListenerLogger(currArn, elcElem.TargetServer)
-			if err != nil {
-				return err
-			}
-			en.internal.targets[currArn] = logger
-		}
+// Set a new notification config for a bucket, this operation will overwrite any previous
+// notification configs for the bucket.
+func (en *eventNotifier) SetBucketNotificationConfig(bucket string, notificationCfg *notificationConfig) error {
+	en.rwMutex.Lock()
+	defer en.rwMutex.Unlock()
+	if notificationCfg == nil {
+		return errInvalidArgument
 	}
+	en.notificationConfigs[bucket] = notificationCfg
 	return nil
 }

-func eventNotifyForBucketNotifications(eventType, objectName, bucketName string, nEvent []NotificationEvent) {
-	nConfig := globalEventNotifier.GetBucketNotificationConfig(bucketName)
-	if nConfig == nil {
-		return
-	}
-	// Validate if the event and object match the queue configs.
-	for _, qConfig := range nConfig.QueueConfigs {
-		eventMatch := eventMatch(eventType, qConfig.Events)
-		ruleMatch := filterRuleMatch(objectName, qConfig.Filter.Key.FilterRules)
-		if eventMatch && ruleMatch {
-			targetLog := globalEventNotifier.GetExternalTarget(qConfig.QueueARN)
-			if targetLog != nil {
-				targetLog.WithFields(logrus.Fields{
-					"Key":       path.Join(bucketName, objectName),
-					"EventType": eventType,
-					"Records":   nEvent,
-				}).Info()
-			}
-		}
-	}
-}
-
-func eventNotifyForBucketListeners(eventType, objectName, bucketName string,
-	nEvent []NotificationEvent) {
-	lCfgs := globalEventNotifier.GetBucketListenerConfig(bucketName)
-	if lCfgs == nil {
-		return
-	}
-	// Validate if the event and object match listener configs
-	for _, lcfg := range lCfgs {
-		ruleMatch := filterRuleMatch(objectName, lcfg.TopicConfig.Filter.Key.FilterRules)
-		eventMatch := eventMatch(eventType, lcfg.TopicConfig.Events)
-		if eventMatch && ruleMatch {
-			targetLog := globalEventNotifier.GetInternalTarget(
-				lcfg.TopicConfig.TopicARN)
-			if targetLog != nil && targetLog.log != nil {
-				targetLog.log.WithFields(logrus.Fields{
-					"Key":       path.Join(bucketName, objectName),
-					"EventType": eventType,
-					"Records":   nEvent,
-				}).Info()
-			}
-		}
-	}
-
-}
-
 // eventNotify notifies an event to relevant targets based on their
-// bucket configuration (notifications and listeners).
+// bucket notification configs.
 func eventNotify(event eventData) {
 	// Notifies a new event.
 	// List of events reported through this function are
@@ -281,6 +177,15 @@ func eventNotify(event eventData) {
 	//  - s3:ObjectCreated:CompleteMultipartUpload
 	//  - s3:ObjectRemoved:Delete

+	nConfig := globalEventNotifier.GetBucketNotificationConfig(event.Bucket)
+	// No bucket notifications enabled, drop the event notification.
+	if nConfig == nil {
+		return
+	}
+	if len(nConfig.QueueConfigs) == 0 && len(nConfig.TopicConfigs) == 0 && len(nConfig.LambdaConfigs) == 0 {
+		return
+	}
+
 	// Event type.
 	eventType := event.Type.String()

@@ -290,40 +195,56 @@ func eventNotify(event eventData) {
 	// Save the notification event to be sent.
 	notificationEvent := []NotificationEvent{newNotificationEvent(event)}

-	// Notify external targets.
-	eventNotifyForBucketNotifications(eventType, objectName, event.Bucket, notificationEvent)
-
-	// Notify internal targets.
-	eventNotifyForBucketListeners(eventType, objectName, event.Bucket, notificationEvent)
+	// Validate if the event and object match the queue configs.
+	for _, qConfig := range nConfig.QueueConfigs {
+		eventMatch := eventMatch(eventType, qConfig.Events)
+		ruleMatch := filterRuleMatch(objectName, qConfig.Filter.Key.FilterRules)
+		if eventMatch && ruleMatch {
+			targetLog := globalEventNotifier.GetQueueTarget(qConfig.QueueARN)
+			if targetLog != nil {
+				targetLog.WithFields(logrus.Fields{
+					"Records": notificationEvent,
+				}).Info()
+			}
+		}
+	}
+	// Validate if the event and object match the sns configs.
+	for _, topicConfig := range nConfig.TopicConfigs {
+		ruleMatch := filterRuleMatch(objectName, topicConfig.Filter.Key.FilterRules)
+		eventMatch := eventMatch(eventType, topicConfig.Events)
+		if eventMatch && ruleMatch {
+			targetListeners := globalEventNotifier.GetSNSTarget(topicConfig.TopicARN)
+			for _, listener := range targetListeners {
+				listener <- notificationEvent
+			}
+		}
+	}
 }

-// loads notification config if any for a given bucket, returns
-// structured notification config.
+// loads notifcation config if any for a given bucket, returns back structured notification config.
 func loadNotificationConfig(bucket string, objAPI ObjectLayer) (*notificationConfig, error) {
 	// Construct the notification config path.
 	notificationConfigPath := path.Join(bucketConfigPrefix, bucket, bucketNotificationConfig)
 	objInfo, err := objAPI.GetObjectInfo(minioMetaBucket, notificationConfigPath)
 	if err != nil {
-		// 'notification.xml' not found return
-		// 'errNoSuchNotifications'.  This is default when no
-		// bucket notifications are found on the bucket.
-		if isErrObjectNotFound(err) || isErrIncompleteBody(err) {
+		// 'notification.xml' not found return 'errNoSuchNotifications'.
+		// This is default when no bucket notifications are found on the bucket.
+		switch err.(type) {
+		case ObjectNotFound:
 			return nil, errNoSuchNotifications
 		}
-		errorIf(err, "Unable to load bucket-notification for bucket %s", bucket)
 		// Returns error for other errors.
 		return nil, err
 	}
 	var buffer bytes.Buffer
 	err = objAPI.GetObject(minioMetaBucket, notificationConfigPath, 0, objInfo.Size, &buffer)
 	if err != nil {
-		// 'notification.xml' not found return
-		// 'errNoSuchNotifications'.  This is default when no
-		// bucket notifications are found on the bucket.
-		if isErrObjectNotFound(err) || isErrIncompleteBody(err) {
+		// 'notification.xml' not found return 'errNoSuchNotifications'.
+		// This is default when no bucket notifications are found on the bucket.
+		switch err.(type) {
+		case ObjectNotFound:
 			return nil, errNoSuchNotifications
 		}
-		errorIf(err, "Unable to load bucket-notification for bucket %s", bucket)
 		// Returns error for other errors.
 		return nil, err
 	}
@@ -333,155 +254,37 @@ func loadNotificationConfig(bucket string, objAPI ObjectLayer) (*notificationCon
 	notificationCfg := &notificationConfig{}
 	if err = xml.Unmarshal(notificationConfigBytes, &notificationCfg); err != nil {
 		return nil, err
-	}
+	} // Successfully marshalled notification configuration.

 	// Return success.
 	return notificationCfg, nil
 }

-// loads notification config if any for a given bucket, returns
-// structured notification config.
-func loadListenerConfig(bucket string, objAPI ObjectLayer) ([]listenerConfig, error) {
-	// in single node mode, there are no peers, so in this case
-	// there is no configuration to load, as any previously
-	// connected listen clients have been disconnected
-	if !globalIsDistXL {
-		return nil, nil
-	}
-
-	// Construct the notification config path.
-	listenerConfigPath := path.Join(bucketConfigPrefix, bucket, bucketListenerConfig)
-	objInfo, err := objAPI.GetObjectInfo(minioMetaBucket, listenerConfigPath)
-	if err != nil {
-		// 'listener.json' not found return
-		// 'errNoSuchNotifications'.  This is default when no
-		// bucket notifications are found on the bucket.
-		if isErrObjectNotFound(err) {
-			return nil, errNoSuchNotifications
-		}
-		errorIf(err, "Unable to load bucket-listeners for bucket %s", bucket)
-		// Returns error for other errors.
-		return nil, err
-	}
-	var buffer bytes.Buffer
-	err = objAPI.GetObject(minioMetaBucket, listenerConfigPath, 0, objInfo.Size, &buffer)
-	if err != nil {
-		// 'notification.xml' not found return
-		// 'errNoSuchNotifications'.  This is default when no
-		// bucket listeners are found on the bucket.
-		if isErrObjectNotFound(err) {
-			return nil, errNoSuchNotifications
-		}
-		errorIf(err, "Unable to load bucket-listeners for bucket %s", bucket)
-		// Returns error for other errors.
-		return nil, err
-	}
-
-	// Unmarshal notification bytes.
-	var lCfg []listenerConfig
-	lConfigBytes := buffer.Bytes()
-	if err = json.Unmarshal(lConfigBytes, &lCfg); err != nil {
-		errorIf(err, "Unable to unmarshal listener config from JSON.")
-		return nil, err
-	}
-
-	// Return success.
-	return lCfg, nil
-}
-
-func persistNotificationConfig(bucket string, ncfg *notificationConfig, obj ObjectLayer) error {
-	// marshal to xml
-	buf, err := xml.Marshal(ncfg)
-	if err != nil {
-		errorIf(err, "Unable to marshal notification configuration into XML")
-		return err
-	}
-
-	// build path
-	ncPath := path.Join(bucketConfigPrefix, bucket, bucketNotificationConfig)
-	// write object to path
-	sha256Sum := getSHA256Hash(buf)
-	_, err = obj.PutObject(minioMetaBucket, ncPath, int64(len(buf)), bytes.NewReader(buf), nil, sha256Sum)
-	if err != nil {
-		errorIf(err, "Unable to write bucket notification configuration.")
-		return err
-	}
-	return nil
-}
-
-// Persists validated listener config to object layer.
-func persistListenerConfig(bucket string, lcfg []listenerConfig, obj ObjectLayer) error {
-	buf, err := json.Marshal(lcfg)
-	if err != nil {
-		errorIf(err, "Unable to marshal listener config to JSON.")
-		return err
-	}
-
-	// build path
-	lcPath := path.Join(bucketConfigPrefix, bucket, bucketListenerConfig)
-	// write object to path
-	sha256Sum := getSHA256Hash(buf)
-	_, err = obj.PutObject(minioMetaBucket, lcPath, int64(len(buf)), bytes.NewReader(buf), nil, sha256Sum)
-	if err != nil {
-		errorIf(err, "Unable to write bucket listener configuration to object layer.")
-	}
-	return err
-}
-
-// Remove listener configuration from storage layer. Used when a bucket is deleted.
-func removeListenerConfig(bucket string, objAPI ObjectLayer) error {
-	// make the path
-	lcPath := path.Join(bucketConfigPrefix, bucket, bucketListenerConfig)
-	// remove it
-	return objAPI.DeleteObject(minioMetaBucket, lcPath)
-}
-
-// Loads both notification and listener config.
-func loadNotificationAndListenerConfig(bucketName string, objAPI ObjectLayer) (nCfg *notificationConfig, lCfg []listenerConfig, err error) {
-	nConfigErrs := []error{
-		// When no previous notification configs were found.
-		errNoSuchNotifications,
-		// net.Dial fails for rpc client or any
-		// other unexpected errors during net.Dial.
-		errDiskNotFound,
-	}
-	// Loads notification config if any.
-	nCfg, err = loadNotificationConfig(bucketName, objAPI)
-	if err != nil && !isErrIgnored(err, nConfigErrs) {
-		return nil, nil, err
-	}
-
-	// Loads listener config if any.
-	lCfg, err = loadListenerConfig(bucketName, objAPI)
-	if err != nil && !isErrIgnored(err, nConfigErrs) {
-		return nil, nil, err
-	}
-	return nCfg, lCfg, nil
-}
-
 // loads all bucket notifications if present.
-func loadAllBucketNotifications(objAPI ObjectLayer) (map[string]*notificationConfig, map[string][]listenerConfig, error) {
+func loadAllBucketNotifications(objAPI ObjectLayer) (map[string]*notificationConfig, error) {
 	// List buckets to proceed loading all notification configuration.
 	buckets, err := objAPI.ListBuckets()
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}

-	nConfigs := make(map[string]*notificationConfig)
-	lConfigs := make(map[string][]listenerConfig)
+	configs := make(map[string]*notificationConfig)

 	// Loads all bucket notifications.
 	for _, bucket := range buckets {
-		// Load persistent notification and listener configurations
-		// a given bucket name.
-		nConfigs[bucket.Name], lConfigs[bucket.Name], err = loadNotificationAndListenerConfig(bucket.Name, objAPI)
+		var nCfg *notificationConfig
+		nCfg, err = loadNotificationConfig(bucket.Name, objAPI)
 		if err != nil {
-			return nil, nil, err
+			if err == errNoSuchNotifications {
+				continue
+			}
+			return nil, err
 		}
+		configs[bucket.Name] = nCfg
 	}

 	// Success.
-	return nConfigs, lConfigs, nil
+	return configs, nil
 }

 // Loads all queue targets, initializes each queueARNs depending on their config.
@@ -505,46 +308,10 @@ func loadAllQueueTargets() (map[string]*logrus.Logger, error) {
 		// Using accountID we can now initialize a new AMQP logrus instance.
 		amqpLog, err := newAMQPNotify(accountID)
 		if err != nil {
-			// Encapsulate network error to be more informative.
-			if _, ok := err.(net.Error); ok {
-				return nil, &net.OpError{
-					Op:  "Connecting to " + queueARN,
-					Net: "tcp",
-					Err: err,
-				}
-			}
 			return nil, err
 		}
 		queueTargets[queueARN] = amqpLog
 	}
-	// Load all nats targets, initialize their respective loggers.
-	for accountID, natsN := range serverConfig.GetNATS() {
-		if !natsN.Enable {
-			continue
-		}
-		// Construct the queue ARN for NATS.
-		queueARN := minioSqs + serverConfig.GetRegion() + ":" + accountID + ":" + queueTypeNATS
-		// Queue target if already initialized we move to the next ARN.
-		_, ok := queueTargets[queueARN]
-		if ok {
-			continue
-		}
-		// Using accountID we can now initialize a new NATS logrus instance.
-		natsLog, err := newNATSNotify(accountID)
-		if err != nil {
-			// Encapsulate network error to be more informative.
-			if _, ok := err.(net.Error); ok {
-				return nil, &net.OpError{
-					Op:  "Connecting to " + queueARN,
-					Net: "tcp",
-					Err: err,
-				}
-			}
-			return nil, err
-		}
-		queueTargets[queueARN] = natsLog
-	}
-
 	// Load redis targets, initialize their respective loggers.
 	for accountID, redisN := range serverConfig.GetRedis() {
 		if !redisN.Enable {
@@ -560,14 +327,6 @@ func loadAllQueueTargets() (map[string]*logrus.Logger, error) {
 		// Using accountID we can now initialize a new Redis logrus instance.
 		redisLog, err := newRedisNotify(accountID)
 		if err != nil {
-			// Encapsulate network error to be more informative.
-			if _, ok := err.(net.Error); ok {
-				return nil, &net.OpError{
-					Op:  "Connecting to " + queueARN,
-					Net: "tcp",
-					Err: err,
-				}
-			}
 			return nil, err
 		}
 		queueTargets[queueARN] = redisLog
@@ -586,43 +345,10 @@ func loadAllQueueTargets() (map[string]*logrus.Logger, error) {
 		// Using accountID we can now initialize a new ElasticSearch logrus instance.
 		elasticLog, err := newElasticNotify(accountID)
 		if err != nil {
-			// Encapsulate network error to be more informative.
-			if _, ok := err.(net.Error); ok {
-				return nil, &net.OpError{
-					Op: "Connecting to " + queueARN, Net: "tcp",
-					Err: err,
-				}
-			}
 			return nil, err
 		}
 		queueTargets[queueARN] = elasticLog
 	}
-	// Load PostgreSQL targets, initialize their respective loggers.
-	for accountID, pgN := range serverConfig.GetPostgreSQL() {
-		if !pgN.Enable {
-			continue
-		}
-		// Construct the queue ARN for Postgres.
-		queueARN := minioSqs + serverConfig.GetRegion() + ":" + accountID + ":" + queueTypePostgreSQL
-		_, ok := queueTargets[queueARN]
-		if ok {
-			continue
-		}
-		// Using accountID initialize a new Postgresql logrus instance.
-		pgLog, err := newPostgreSQLNotify(accountID)
-		if err != nil {
-			// Encapsulate network error to be more informative.
-			if _, ok := err.(net.Error); ok {
-				return nil, &net.OpError{
-					Op: "Connecting to " + queueARN, Net: "tcp",
-					Err: err,
-				}
-			}
-			return nil, err
-		}
-		queueTargets[queueARN] = pgLog
-	}
-
 	// Successfully initialized queue targets.
 	return queueTargets, nil
 }
@@ -637,9 +363,8 @@ func initEventNotifier(objAPI ObjectLayer) error {
 	}

 	// Read all saved bucket notifications.
-	nConfigs, lConfigs, err := loadAllBucketNotifications(objAPI)
+	configs, err := loadAllBucketNotifications(objAPI)
 	if err != nil {
-		errorIf(err, "Error loading bucket notifications - %v", err)
 		return err
 	}

@@ -649,36 +374,12 @@ func initEventNotifier(objAPI ObjectLayer) error {
 		return err
 	}

-	// Initialize internal listener targets
-	listenTargets := make(map[string]*listenerLogger)
-	for _, listeners := range lConfigs {
-		for _, listener := range listeners {
-			ln, err := newListenerLogger(
-				listener.TopicConfig.TopicARN,
-				listener.TargetServer,
-			)
-			if err != nil {
-				errorIf(err, "Unable to initialize listener target logger.")
-				//TODO: improve error
-				return fmt.Errorf("Error initializing listner target logger - %v", err)
-			}
-			listenTargets[listener.TopicConfig.TopicARN] = ln
-		}
-	}
-
-	// Initialize event notifier queue.
+	// Inititalize event notifier queue.
 	globalEventNotifier = &eventNotifier{
-		external: externalNotifier{
-			notificationConfigs: nConfigs,
-			targets:             queueTargets,
-			rwMutex:             &sync.RWMutex{},
-		},
-		internal: internalNotifier{
-			rwMutex:            &sync.RWMutex{},
-			targets:            listenTargets,
-			listenerConfigs:    lConfigs,
-			connectedListeners: make(map[string]chan []NotificationEvent),
-		},
+		rwMutex:             &sync.RWMutex{},
+		notificationConfigs: configs,
+		queueTargets:        queueTargets,
+		snsTargets:          make(map[string][]chan []NotificationEvent),
 	}

 	return nil
@@ -17,497 +17,117 @@
 package cmd

 import (
-	"fmt"
-	"net"
 	"reflect"
 	"testing"
-	"time"
 )

-// Test InitEventNotifier with faulty disks
-func TestInitEventNotifierFaultyDisks(t *testing.T) {
-	// Prepare for tests
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Init Test config failed")
-	}
-	// remove the root directory after the test ends.
-	defer removeAll(rootPath)
-
-	disks, err := getRandomDisks(1)
-	if err != nil {
-		t.Fatal("Unable to create directories for FS backend. ", err)
-	}
-	defer removeAll(disks[0])
-	endpoints, err := parseStorageEndpoints(disks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	obj, _, err := initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal("Unable to initialize FS backend.", err)
-	}
-
-	bucketName := "bucket"
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	fs := obj.(fsObjects)
-	fsstorage := fs.storage.(*retryStorage)
-
-	listenARN := "arn:minio:sns:us-east-1:1:listen"
-	queueARN := "arn:minio:sqs:us-east-1:1:redis"
-
-	// Write a notification.xml in the disk
-	notificationXML := "<NotificationConfiguration>"
-	notificationXML += "<TopicConfiguration><Event>s3:ObjectRemoved:*</Event><Event>s3:ObjectRemoved:*</Event><Topic>" + listenARN + "</Topic></TopicConfiguration>"
-	notificationXML += "<QueueConfiguration><Event>s3:ObjectRemoved:*</Event><Event>s3:ObjectRemoved:*</Event><Queue>" + queueARN + "</Queue></QueueConfiguration>"
-	notificationXML += "</NotificationConfiguration>"
-	if err := fsstorage.AppendFile(minioMetaBucket, bucketConfigPrefix+"/"+bucketName+"/"+bucketNotificationConfig, []byte(notificationXML)); err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	// Test initEventNotifier() with faulty disks
-	for i := 1; i <= 5; i++ {
-		fs.storage = newNaughtyDisk(fsstorage, map[int]error{i: errFaultyDisk}, nil)
-		if err := initEventNotifier(fs); errorCause(err) != errFaultyDisk {
-			t.Fatal("Unexpected error:", err)
-		}
-	}
+// Tests event notify.
+func TestEventNotify(t *testing.T) {
+	ExecObjectLayerTest(t, testEventNotify)
 }

-// InitEventNotifierWithAMQP - tests InitEventNotifier when AMQP is not prepared
-func TestInitEventNotifierWithAMQP(t *testing.T) {
-	// initialize the server and obtain the credentials and root.
-	// credentials are necessary to sign the HTTP request.
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Init Test config failed")
-	}
-	// remove the root directory after the test ends.
-	defer removeAll(rootPath)
-
-	disks, err := getRandomDisks(1)
-	defer removeAll(disks[0])
-	if err != nil {
-		t.Fatal("Unable to create directories for FS backend. ", err)
-	}
-	endpoints, err := parseStorageEndpoints(disks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fs, _, err := initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal("Unable to initialize FS backend.", err)
-	}
-
-	serverConfig.SetAMQPNotifyByID("1", amqpNotify{Enable: true})
-	if err := initEventNotifier(fs); err == nil {
-		t.Fatal("AMQP config didn't fail.")
-	}
-}
-
-// InitEventNotifierWithElasticSearch - test InitEventNotifier when ElasticSearch is not ready
-func TestInitEventNotifierWithElasticSearch(t *testing.T) {
-	// initialize the server and obtain the credentials and root.
-	// credentials are necessary to sign the HTTP request.
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Init Test config failed")
-	}
-	// remove the root directory after the test ends.
-	defer removeAll(rootPath)
-
-	disks, err := getRandomDisks(1)
-	defer removeAll(disks[0])
-	if err != nil {
-		t.Fatal("Unable to create directories for FS backend. ", err)
-	}
-	endpoints, err := parseStorageEndpoints(disks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fs, _, err := initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal("Unable to initialize FS backend.", err)
-	}
-
-	serverConfig.SetElasticSearchNotifyByID("1", elasticSearchNotify{Enable: true})
-	if err := initEventNotifier(fs); err == nil {
-		t.Fatal("ElasticSearch config didn't fail.")
-	}
-}
-
-// InitEventNotifierWithRedis - test InitEventNotifier when Redis is not ready
-func TestInitEventNotifierWithRedis(t *testing.T) {
-	// initialize the server and obtain the credentials and root.
-	// credentials are necessary to sign the HTTP request.
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatalf("Init Test config failed")
-	}
-	// remove the root directory after the test ends.
-	defer removeAll(rootPath)
-
-	disks, err := getRandomDisks(1)
-	defer removeAll(disks[0])
-	if err != nil {
-		t.Fatal("Unable to create directories for FS backend. ", err)
-	}
-	endpoints, err := parseStorageEndpoints(disks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fs, _, err := initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal("Unable to initialize FS backend.", err)
-	}
-
-	serverConfig.SetRedisNotifyByID("1", redisNotify{Enable: true})
-	if err := initEventNotifier(fs); err == nil {
-		t.Fatal("Redis config didn't fail.")
-	}
-}
-
-type TestPeerRPCServerData struct {
-	serverType string
-	testServer TestServer
-}
-
-func (s *TestPeerRPCServerData) Setup(t *testing.T) {
-	s.testServer = StartTestPeersRPCServer(t, s.serverType)
-
-	// setup port and minio addr
-	host, port, err := net.SplitHostPort(s.testServer.Server.Listener.Addr().String())
-	if err != nil {
-		t.Fatalf("Initialisation error: %v", err)
-	}
-	globalMinioHost = host
-	globalMinioPort = port
-	globalMinioAddr = getLocalAddress(
-		s.testServer.SrvCmdCfg,
-	)
-
-	// initialize the peer client(s)
-	initGlobalS3Peers(s.testServer.Disks)
-}
-
-func (s *TestPeerRPCServerData) TearDown() {
-	s.testServer.Stop()
-	_ = removeAll(s.testServer.Root)
-	for _, d := range s.testServer.Disks {
-		_ = removeAll(d.Path)
-	}
-}
-
-func TestSetNGetBucketNotification(t *testing.T) {
-	s := TestPeerRPCServerData{serverType: "XL"}
-
-	// setup and teardown
-	s.Setup(t)
-	defer s.TearDown()
-
+func testEventNotify(obj ObjectLayer, instanceType string, t TestErrHandler) {
 	bucketName := getRandomBucketName()

-	obj := s.testServer.Obj
-	if err := initEventNotifier(obj); err != nil {
-		t.Fatal("Unexpected error:", err)
+	// initialize the server and obtain the credentials and root.
+	// credentials are necessary to sign the HTTP request.
+	rootPath, err := newTestConfig("us-east-1")
+	if err != nil {
+		t.Fatalf("Init Test config failed")
 	}
+	// remove the root folder after the test ends.
+	defer removeAll(rootPath)

-	globalEventNotifier.SetBucketNotificationConfig(bucketName, &notificationConfig{})
-	nConfig := globalEventNotifier.GetBucketNotificationConfig(bucketName)
-	if nConfig == nil {
-		t.Errorf("Notification expected to be set, but notification not set.")
-	}
+	initEventNotifier(obj)

-	if !reflect.DeepEqual(nConfig, &notificationConfig{}) {
-		t.Errorf("Mismatching notification configs.")
-	}
-}
-
-func TestInitEventNotifier(t *testing.T) {
-	s := TestPeerRPCServerData{serverType: "XL"}
-
-	// setup and teardown
-	s.Setup(t)
-	defer s.TearDown()
-
-	// test if empty object layer arg. returns expected error.
-	if err := initEventNotifier(nil); err == nil || err != errInvalidArgument {
-		t.Fatalf("initEventNotifier returned unexpected error value - %v", err)
-	}
-
-	obj := s.testServer.Obj
-	bucketName := getRandomBucketName()
-	// declare sample configs
-	filterRules := []filterRule{
-		{
-			Name:  "prefix",
-			Value: "minio",
-		},
-		{
-			Name:  "suffix",
-			Value: "*.jpg",
-		},
-	}
-	sampleSvcCfg := ServiceConfig{
-		[]string{"s3:ObjectRemoved:*", "s3:ObjectCreated:*"},
-		filterStruct{
-			keyFilter{filterRules},
-		},
-		"1",
-	}
-	sampleNotifCfg := notificationConfig{
-		QueueConfigs: []queueConfig{
-			{
-				ServiceConfig: sampleSvcCfg,
-				QueueARN:      "testqARN",
-			},
-		},
-	}
-	sampleListenCfg := []listenerConfig{
-		{
-			TopicConfig: topicConfig{ServiceConfig: sampleSvcCfg,
-				TopicARN: "testlARN"},
-			TargetServer: globalMinioAddr,
-		},
-	}
-
-	// create bucket
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	// bucket is created, now writing should not give errors.
-	if err := persistNotificationConfig(bucketName, &sampleNotifCfg, obj); err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	if err := persistListenerConfig(bucketName, sampleListenCfg, obj); err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	// needed to load listener config from disk for testing (in
-	// single peer mode, the listener config is ingored, but here
-	// we want to test the loading from disk too.)
-	globalIsDistXL = true
-
-	// test event notifier init
-	if err := initEventNotifier(obj); err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	// fetch bucket configs and verify
-	ncfg := globalEventNotifier.GetBucketNotificationConfig(bucketName)
-	if ncfg == nil {
-		t.Error("Bucket notification was not present for ", bucketName)
-	}
-	if len(ncfg.QueueConfigs) != 1 || ncfg.QueueConfigs[0].QueueARN != "testqARN" {
-		t.Error("Unexpected bucket notification found - ", *ncfg)
-	}
-	if globalEventNotifier.GetExternalTarget("testqARN") != nil {
-		t.Error("A logger was not expected to be found as it was not enabled in the config.")
-	}
-
-	lcfg := globalEventNotifier.GetBucketListenerConfig(bucketName)
-	if lcfg == nil {
-		t.Error("Bucket listener was not present for ", bucketName)
-	}
-	if len(lcfg) != 1 || lcfg[0].TargetServer != globalMinioAddr || lcfg[0].TopicConfig.TopicARN != "testlARN" {
-		t.Error("Unexpected listener config found - ", lcfg[0])
-	}
-	if globalEventNotifier.GetInternalTarget("testlARN") == nil {
-		t.Error("A listen logger was not found.")
-	}
-}
-
-func TestListenBucketNotification(t *testing.T) {
-	s := TestPeerRPCServerData{serverType: "XL"}
-	// setup and teardown
-	s.Setup(t)
-	defer s.TearDown()
-
-	// test initialisation
-	obj := s.testServer.Obj
-
-	bucketName := "bucket"
-	objectName := "object"
-
-	// Create the bucket to listen on
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	listenARN := fmt.Sprintf("%s:%s:1:%s-%s",
-		minioTopic,
-		serverConfig.GetRegion(),
-		snsTypeMinio,
-		s.testServer.Server.Listener.Addr(),
-	)
-	lcfg := listenerConfig{
-		TopicConfig: topicConfig{
-			ServiceConfig{
-				[]string{"s3:ObjectRemoved:*", "s3:ObjectCreated:*"},
-				filterStruct{},
-				"0",
-			},
-			listenARN,
-		},
-		TargetServer: globalMinioAddr,
-	}
-
-	// write listener config to storage layer
-	lcfgs := []listenerConfig{lcfg}
-	if err := persistListenerConfig(bucketName, lcfgs, obj); err != nil {
-		t.Fatalf("Test Setup error: %v", err)
-	}
-
-	// needed to load listener config from disk for testing (in
-	// single peer mode, the listener config is ingored, but here
-	// we want to test the loading from disk too.)
-	globalIsDistXL = true
-
-	// Init event notifier
-	if err := initEventNotifier(obj); err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	// Check if the config is loaded
-	listenerCfg := globalEventNotifier.GetBucketListenerConfig(bucketName)
-	if listenerCfg == nil {
-		t.Fatal("Cannot load bucket listener config")
-	}
-	if len(listenerCfg) != 1 {
-		t.Fatal("Listener config is not correctly loaded. Exactly one listener config is expected")
-	}
-
-	// Check if topic ARN is correct
-	if listenerCfg[0].TopicConfig.TopicARN != listenARN {
-		t.Fatal("Configured topic ARN is incorrect.")
-	}
-
-	// Create a new notification event channel.
-	nEventCh := make(chan []NotificationEvent)
-	// Close the listener channel.
-	defer close(nEventCh)
-	// Add events channel for listener.
-	if err := globalEventNotifier.AddListenerChan(listenARN, nEventCh); err != nil {
-		t.Fatalf("Test Setup error: %v", err)
-	}
-	// Remove listen channel after the writer has closed or the
-	// client disconnected.
-	defer globalEventNotifier.RemoveListenerChan(listenARN)
-
-	// Fire an event notification
-	go eventNotify(eventData{
-		Type:   ObjectRemovedDelete,
+	// Notify object created event.
+	eventNotify(eventData{
+		Type:   ObjectCreatedPost,
 		Bucket: bucketName,
 		ObjInfo: ObjectInfo{
 			Bucket: bucketName,
-			Name:   objectName,
+			Name:   "object1",
 		},
 		ReqParams: map[string]string{
 			"sourceIPAddress": "localhost:1337",
 		},
 	})

-	// Wait for the event notification here, if nothing is received within 30 seconds,
-	// test error will be fired
-	select {
-	case n := <-nEventCh:
-		// Check that received event
-		if len(n) == 0 {
-			t.Fatal("Unexpected error occurred")
-		}
-		if n[0].S3.Object.Key != objectName {
-			t.Fatalf("Received wrong object name in notification, expected %s, received %s", n[0].S3.Object.Key, objectName)
-		}
-		break
-	case <-time.After(3 * time.Second):
-		break
+	if err := globalEventNotifier.SetBucketNotificationConfig(bucketName, nil); err != errInvalidArgument {
+		t.Errorf("Expected error %s, got %s", errInvalidArgument, err)
 	}

+	if err := globalEventNotifier.SetBucketNotificationConfig(bucketName, &notificationConfig{}); err != nil {
+		t.Errorf("Expected error to be nil, got %s", err)
+	}
+
+	if !globalEventNotifier.IsBucketNotificationSet(bucketName) {
+		t.Errorf("Notification expected to be set, but notification not set.")
+	}
+
+	nConfig := globalEventNotifier.GetBucketNotificationConfig(bucketName)
+	if !reflect.DeepEqual(nConfig, &notificationConfig{}) {
+		t.Errorf("Mismatching notification configs.")
+	}
+
+	// Notify object created event.
+	eventNotify(eventData{
+		Type:   ObjectCreatedPost,
+		Bucket: bucketName,
+		ObjInfo: ObjectInfo{
+			Bucket: bucketName,
+			Name:   "object1",
+		},
+		ReqParams: map[string]string{
+			"sourceIPAddress": "localhost:1337",
+		},
+	})
 }

-func TestAddRemoveBucketListenerConfig(t *testing.T) {
-	s := TestPeerRPCServerData{serverType: "XL"}
-
-	// setup and teardown
-	s.Setup(t)
-	defer s.TearDown()
-
-	// test code
-	obj := s.testServer.Obj
-	if err := initEventNotifier(obj); err != nil {
-		t.Fatalf("Failed to initialize event notifier: %v", err)
+// Tests various forms of inititalization of event notifier.
+func TestInitEventNotifier(t *testing.T) {
+	fs, disk, err := getSingleNodeObjectLayer()
+	if err != nil {
+		t.Fatal("Unable to initialize FS backend.", err)
+	}
+	xl, disks, err := getXLObjectLayer()
+	if err != nil {
+		t.Fatal("Unable to initialize XL backend.", err)
 	}

-	// Make a bucket to store topicConfigs.
-	randBucket := getRandomBucketName()
-	if err := obj.MakeBucket(randBucket); err != nil {
-		t.Fatalf("Failed to make bucket %s", randBucket)
+	disks = append(disks, disk)
+	for _, d := range disks {
+		defer removeAll(d)
 	}

-	// Add a topicConfig to an empty notificationConfig.
-	accountID := fmt.Sprintf("%d", time.Now().UTC().UnixNano())
-	accountARN := fmt.Sprintf(
-		"arn:minio:sqs:%s:%s:listen-%s",
-		serverConfig.GetRegion(),
-		accountID,
-		globalMinioAddr,
-	)
-
-	// Make topic configuration
-	filterRules := []filterRule{
-		{
-			Name:  "prefix",
-			Value: "minio",
-		},
-		{
-			Name:  "suffix",
-			Value: "*.jpg",
-		},
-	}
-	sampleTopicCfg := topicConfig{
-		TopicARN: accountARN,
-		ServiceConfig: ServiceConfig{
-			[]string{"s3:ObjectRemoved:*", "s3:ObjectCreated:*"},
-			filterStruct{
-				keyFilter{filterRules},
-			},
-			"sns-" + accountID,
-		},
-	}
-	sampleListenerCfg := &listenerConfig{
-		TopicConfig:  sampleTopicCfg,
-		TargetServer: globalMinioAddr,
-	}
+	// Collection of test cases for inititalizing event notifier.
 	testCases := []struct {
-		lCfg        *listenerConfig
-		expectedErr error
+		objAPI  ObjectLayer
+		configs map[string]*notificationConfig
+		err     error
 	}{
-		{sampleListenerCfg, nil},
-		{nil, errInvalidArgument},
+		// Test 1 - invalid arguments.
+		{
+			objAPI: nil,
+			err:    errInvalidArgument,
+		},
+		// Test 2 - valid FS object layer but no bucket notifications.
+		{
+			objAPI: fs,
+			err:    nil,
+		},
+		// Test 3 - valid XL object layer but no bucket notifications.
+		{
+			objAPI: xl,
+			err:    nil,
+		},
 	}

-	for i, test := range testCases {
-		err := AddBucketListenerConfig(randBucket, test.lCfg, obj)
-		if err != test.expectedErr {
-			t.Errorf(
-				"Test %d: Failed with error %v, expected to fail with %v",
-				i+1, err, test.expectedErr,
-			)
+	// Validate if event notifier is properly initialized.
+	for i, testCase := range testCases {
+		err = initEventNotifier(testCase.objAPI)
+		if err != testCase.err {
+			t.Errorf("Test %d: Expected %s, but got: %s", i+1, testCase.err, err)
 		}
 	}
-
-	// test remove listener actually removes a listener
-	RemoveBucketListenerConfig(randBucket, sampleListenerCfg, obj)
-	// since it does not return errors we fetch the config and
-	// check
-	lcSlice := globalEventNotifier.GetBucketListenerConfig(randBucket)
-	if len(lcSlice) != 0 {
-		t.Errorf("Remove Listener Config Test: did not remove listener config - %v",
-			lcSlice)
-	}
 }
@@ -1,25 +0,0 @@
-// +build !linux
-
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-// Fallocate is not POSIX and not supported under Windows
-// Always return successful
-func Fallocate(fd int, offset int64, len int64) error {
-	return nil
-}
@@ -1,31 +0,0 @@
-// +build linux
-
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import "syscall"
-
-// Fallocate uses the linux Fallocate syscall, which helps us to be
-// sure that subsequent writes on a file just created will not fail,
-// in addition, file allocation will be contigous on the disk
-func Fallocate(fd int, offset int64, len int64) error {
-	return syscall.Fallocate(fd,
-		1, // FALLOC_FL_KEEP_SIZE
-		offset,
-		len)
-}
@@ -149,20 +149,6 @@ func reduceFormatErrs(errs []error, diskCount int) (err error) {
 	return nil
 }

-// creates format.json, the FS format info in minioMetaBucket.
-func initFormatFS(storageDisk StorageAPI) error {
-	// Initialize meta volume, if volume already exists ignores it.
-	if err := initMetaVolume([]StorageAPI{storageDisk}); err != nil {
-		return fmt.Errorf("Unable to initialize '.minio.sys' meta volume, %s", err)
-	}
-	return saveFSFormatData(storageDisk, newFSFormatV1())
-}
-
-// loads format.json from minioMetaBucket if it exists.
-func loadFormatFS(storageDisk StorageAPI) (format *formatConfigV1, err error) {
-	return loadFormat(storageDisk)
-}
-
 // loadAllFormats - load all format config from all input disks in parallel.
 func loadAllFormats(bootstrapDisks []StorageAPI) ([]*formatConfigV1, []error) {
 	// Initialize sync waitgroup.
@@ -203,7 +189,7 @@ func loadAllFormats(bootstrapDisks []StorageAPI) ([]*formatConfigV1, []error) {
 		}
 	}
 	// Return all formats and nil
-	return formatConfigs, sErrs
+	return formatConfigs, nil
 }

 // genericFormatCheck - validates and returns error.
@@ -212,17 +198,6 @@ func loadAllFormats(bootstrapDisks []StorageAPI) ([]*formatConfigV1, []error) {
 // if (jbod inconsistent) return error // phase2
 // if (disks not recognized) // Always error.
 func genericFormatCheck(formatConfigs []*formatConfigV1, sErrs []error) (err error) {
-	if len(formatConfigs) == 1 {
-		// Successfully read, validate further.
-		if sErrs[0] == nil {
-			if !isFSFormat(formatConfigs[0]) {
-				return errFSDiskFormat
-			}
-			return nil
-		} // Returns error here.
-		return sErrs[0]
-	}
-
 	// Calculate the errors.
 	var (
 		errCorruptFormatCount = 0
@@ -246,7 +221,7 @@ func genericFormatCheck(formatConfigs []*formatConfigV1, sErrs []error) (err err
 	}

 	// Calculate read quorum.
-	readQuorum := len(formatConfigs) / 2
+	readQuorum := len(formatConfigs)/2 + 1

 	// Validate the err count under tolerant limit.
 	if errCount > len(formatConfigs)-readQuorum {
@@ -342,7 +317,7 @@ func checkJBODConsistency(formatConfigs []*formatConfigV1) error {
 		}
 		currentJBOD := format.XL.JBOD
 		if !reflect.DeepEqual(sentinelJBOD, currentJBOD) {
-			return errors.New("Inconsistent JBOD found")
+			return errors.New("Inconsistent JBOD found.")
 		}
 	}
 	return nil
@@ -415,7 +390,8 @@ func loadFormat(disk StorageAPI) (format *formatConfigV1, err error) {
 	return format, nil
 }

-// isFormatNotFound - returns true if all `format.json` are not found on all disks.
+// isFormatNotFound - returns true if all `format.json` are not
+// found on all disks.
 func isFormatNotFound(formats []*formatConfigV1) bool {
 	for _, format := range formats {
 		// One of the `format.json` is found.
@@ -427,7 +403,8 @@ func isFormatNotFound(formats []*formatConfigV1) bool {
 	return true
 }

-// isFormatFound - returns true if all input formats are found on all disks.
+// isFormatFound - returns true if all input formats are found on
+// all disks.
 func isFormatFound(formats []*formatConfigV1) bool {
 	for _, format := range formats {
 		// One of `format.json` is not found.
@@ -506,7 +483,7 @@ func healFormatXLFreshDisks(storageDisks []StorageAPI) error {
 	// From ordered disks fill the UUID position.
 	for index, disk := range orderedDisks {
 		if disk == nil {
-			newJBOD[index] = mustGetUUID()
+			newJBOD[index] = getUUID()
 		}
 	}

@@ -547,11 +524,6 @@ func healFormatXLFreshDisks(storageDisks []StorageAPI) error {
 		}
 	}

-	// Initialize meta volume, if volume already exists ignores it.
-	if err := initMetaVolume(orderedDisks); err != nil {
-		return fmt.Errorf("Unable to initialize '.minio.sys' meta volume, %s", err)
-	}
-
 	// Save new `format.json` across all disks, in JBOD order.
 	return saveFormatXL(orderedDisks, newFormatConfigs)
 }
@@ -696,7 +668,7 @@ func healFormatXLCorruptedDisks(storageDisks []StorageAPI) error {
 	// From ordered disks fill the UUID position.
 	for index, disk := range orderedDisks {
 		if disk == nil {
-			newJBOD[index] = mustGetUUID()
+			newJBOD[index] = getUUID()
 		}
 	}

@@ -743,10 +715,9 @@ func healFormatXLCorruptedDisks(storageDisks []StorageAPI) error {

 // loadFormatXL - loads XL `format.json` and returns back properly
 // ordered storage slice based on `format.json`.
-func loadFormatXL(bootstrapDisks []StorageAPI, readQuorum int) (disks []StorageAPI, err error) {
+func loadFormatXL(bootstrapDisks []StorageAPI) (disks []StorageAPI, err error) {
 	var unformattedDisksFoundCnt = 0
 	var diskNotFoundCount = 0
-	var corruptedDisksFoundCnt = 0
 	formatConfigs := make([]*formatConfigV1, len(bootstrapDisks))

 	// Try to load `format.json` bootstrap disks.
@@ -764,9 +735,6 @@ func loadFormatXL(bootstrapDisks []StorageAPI, readQuorum int) (disks []StorageA
 			} else if err == errDiskNotFound {
 				diskNotFoundCount++
 				continue
-			} else if err == errCorruptedFormat {
-				corruptedDisksFoundCnt++
-				continue
 			}
 			return nil, err
 		}
@@ -775,13 +743,11 @@ func loadFormatXL(bootstrapDisks []StorageAPI, readQuorum int) (disks []StorageA
 	}

 	// If all disks indicate that 'format.json' is not available return 'errUnformattedDisk'.
-	if unformattedDisksFoundCnt > len(bootstrapDisks)-readQuorum {
+	if unformattedDisksFoundCnt > len(bootstrapDisks)-(len(bootstrapDisks)/2+1) {
 		return nil, errUnformattedDisk
-	} else if corruptedDisksFoundCnt > len(bootstrapDisks)-readQuorum {
-		return nil, errCorruptedFormat
 	} else if diskNotFoundCount == len(bootstrapDisks) {
 		return nil, errDiskNotFound
-	} else if diskNotFoundCount > len(bootstrapDisks)-readQuorum {
+	} else if diskNotFoundCount > len(bootstrapDisks)-(len(bootstrapDisks)/2+1) {
 		return nil, errXLReadQuorum
 	}

@@ -801,10 +767,10 @@ func checkFormatXL(formatConfigs []*formatConfigV1) error {
 		}
 		// Validate format version and format type.
 		if formatXL.Version != "1" {
-			return fmt.Errorf("Unsupported version of backend format [%s] found", formatXL.Version)
+			return fmt.Errorf("Unsupported version of backend format [%s] found.", formatXL.Version)
 		}
 		if formatXL.Format != "xl" {
-			return fmt.Errorf("Unsupported backend format [%s] found", formatXL.Format)
+			return fmt.Errorf("Unsupported backend format [%s] found.", formatXL.Format)
 		}
 		if formatXL.XL.Version != "1" {
 			return fmt.Errorf("Unsupported XL backend format found [%s]", formatXL.XL.Version)
@@ -889,7 +855,7 @@ func initFormatXL(storageDisks []StorageAPI) (err error) {
 			Format:  "xl",
 			XL: &xlFormat{
 				Version: "1",
-				Disk:    mustGetUUID(),
+				Disk:    getUUID(),
 			},
 		}
 		jbod[index] = formats[index].XL.Disk
@@ -904,11 +870,6 @@ func initFormatXL(storageDisks []StorageAPI) (err error) {
 		formats[index].XL.JBOD = jbod
 	}

-	// Initialize meta volume, if volume already exists ignores it.
-	if err := initMetaVolume(storageDisks); err != nil {
-		return fmt.Errorf("Unable to initialize '.minio.sys' meta volume, %s", err)
-	}
-
 	// Save formats `format.json` across all disks.
 	return saveFormatXL(storageDisks, formats)
 }
@@ -26,7 +26,7 @@ func genFormatXLValid() []*formatConfigV1 {
 	jbod := make([]string, 8)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	for index := range jbod {
 		formatConfigs[index] = &formatConfigV1{
@@ -47,7 +47,7 @@ func genFormatXLInvalidVersion() []*formatConfigV1 {
 	jbod := make([]string, 8)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	for index := range jbod {
 		formatConfigs[index] = &formatConfigV1{
@@ -71,7 +71,7 @@ func genFormatXLInvalidFormat() []*formatConfigV1 {
 	jbod := make([]string, 8)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	for index := range jbod {
 		formatConfigs[index] = &formatConfigV1{
@@ -95,7 +95,7 @@ func genFormatXLInvalidXLVersion() []*formatConfigV1 {
 	jbod := make([]string, 8)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	for index := range jbod {
 		formatConfigs[index] = &formatConfigV1{
@@ -114,19 +114,12 @@ func genFormatXLInvalidXLVersion() []*formatConfigV1 {
 	return formatConfigs
 }

-func genFormatFS() *formatConfigV1 {
-	return &formatConfigV1{
-		Version: "1",
-		Format:  "fs",
-	}
-}
-
 // generates a invalid format.json version for XL backend.
 func genFormatXLInvalidJBODCount() []*formatConfigV1 {
 	jbod := make([]string, 7)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	for index := range jbod {
 		formatConfigs[index] = &formatConfigV1{
@@ -147,7 +140,7 @@ func genFormatXLInvalidJBOD() []*formatConfigV1 {
 	jbod := make([]string, 8)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	for index := range jbod {
 		formatConfigs[index] = &formatConfigV1{
@@ -161,7 +154,7 @@ func genFormatXLInvalidJBOD() []*formatConfigV1 {
 		}
 	}
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	// Corrupt JBOD entries on disk 6 and disk 8.
 	formatConfigs[5].XL.JBOD = jbod
@@ -174,7 +167,7 @@ func genFormatXLInvalidDisks() []*formatConfigV1 {
 	jbod := make([]string, 8)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	for index := range jbod {
 		formatConfigs[index] = &formatConfigV1{
@@ -188,8 +181,8 @@ func genFormatXLInvalidDisks() []*formatConfigV1 {
 		}
 	}
 	// Make disk 5 and disk 8 have inconsistent disk uuid's.
-	formatConfigs[4].XL.Disk = mustGetUUID()
-	formatConfigs[7].XL.Disk = mustGetUUID()
+	formatConfigs[4].XL.Disk = getUUID()
+	formatConfigs[7].XL.Disk = getUUID()
 	return formatConfigs
 }

@@ -198,7 +191,7 @@ func genFormatXLInvalidDisksOrder() []*formatConfigV1 {
 	jbod := make([]string, 8)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 	}
 	for index := range jbod {
 		formatConfigs[index] = &formatConfigV1{
@@ -222,8 +215,9 @@ func genFormatXLInvalidDisksOrder() []*formatConfigV1 {
 }

 func prepareFormatXLHealFreshDisks(obj ObjectLayer) ([]StorageAPI, error) {
+
 	var err error
-	xl := obj.(*xlObjects)
+	xl := obj.(xlObjects)

 	err = obj.MakeBucket("bucket")
 	if err != nil {
@@ -232,9 +226,8 @@ func prepareFormatXLHealFreshDisks(obj ObjectLayer) ([]StorageAPI, error) {

 	bucket := "bucket"
 	object := "object"
-	sha256sum := ""

-	_, err = obj.PutObject(bucket, object, int64(len("abcd")), bytes.NewReader([]byte("abcd")), nil, sha256sum)
+	_, err = obj.PutObject(bucket, object, int64(len("abcd")), bytes.NewReader([]byte("abcd")), nil)
 	if err != nil {
 		return []StorageAPI{}, err
 	}
@@ -270,17 +263,8 @@ func prepareFormatXLHealFreshDisks(obj ObjectLayer) ([]StorageAPI, error) {
 }

 func TestFormatXLHealFreshDisks(t *testing.T) {
-	nDisks := 16
-	fsDirs, err := getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoints, err := parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
 	// Create an instance of xl backend.
-	obj, _, err := initObjectLayer(endpoints)
+	obj, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Error(err)
 	}
@@ -296,7 +280,7 @@ func TestFormatXLHealFreshDisks(t *testing.T) {
 	}

 	// Load again XL format.json to validate it
-	_, err = loadFormatXL(storageDisks, 8)
+	_, err = loadFormatXL(storageDisks)
 	if err != nil {
 		t.Fatal("loading healed disk failed: ", err)
 	}
@@ -306,17 +290,8 @@ func TestFormatXLHealFreshDisks(t *testing.T) {
 }

 func TestFormatXLHealFreshDisksErrorExpected(t *testing.T) {
-	nDisks := 16
-	fsDirs, err := getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoints, err := parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
 	// Create an instance of xl backend.
-	obj, _, err := initObjectLayer(endpoints)
+	obj, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Error(err)
 	}
@@ -326,11 +301,13 @@ func TestFormatXLHealFreshDisksErrorExpected(t *testing.T) {
 		t.Fatal(err)
 	}

-	// Prepares all disks are offline.
-	prepareNOfflineDisks(storageDisks, 16, t)
+	for i := 0; i < 16; i++ {
+		d := storageDisks[i].(*posix)
+		storageDisks[i] = &naughtyDisk{disk: d, defaultErr: errDiskNotFound}
+	}

 	// Load again XL format.json to validate it
-	_, err = loadFormatXL(storageDisks, 8)
+	_, err = loadFormatXL(storageDisks)
 	if err == nil {
 		t.Fatal("loading format disk error")
 	}
@@ -349,12 +326,12 @@ func TestFormatXLHealFreshDisksErrorExpected(t *testing.T) {
 // a given disk to test healing a corrupted disk
 func TestFormatXLHealCorruptedDisks(t *testing.T) {
 	// Create an instance of xl backend.
-	obj, fsDirs, err := prepareXL()
+	obj, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}

-	xl := obj.(*xlObjects)
+	xl := obj.(xlObjects)

 	err = obj.MakeBucket("bucket")
 	if err != nil {
@@ -363,9 +340,8 @@ func TestFormatXLHealCorruptedDisks(t *testing.T) {

 	bucket := "bucket"
 	object := "object"
-	sha256sum := ""

-	_, err = obj.PutObject(bucket, object, int64(len("abcd")), bytes.NewReader([]byte("abcd")), nil, sha256sum)
+	_, err = obj.PutObject(bucket, object, int64(len("abcd")), bytes.NewReader([]byte("abcd")), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -409,7 +385,7 @@ func TestFormatXLHealCorruptedDisks(t *testing.T) {
 	}

 	// Load again XL format.json to validate it
-	_, err = loadFormatXL(permutedStorageDisks, 8)
+	_, err = loadFormatXL(permutedStorageDisks)
 	if err != nil {
 		t.Fatal("loading healed disk failed: ", err)
 	}
@@ -422,12 +398,12 @@ func TestFormatXLHealCorruptedDisks(t *testing.T) {
 // some of format.json
 func TestFormatXLReorderByInspection(t *testing.T) {
 	// Create an instance of xl backend.
-	obj, fsDirs, err := prepareXL()
+	obj, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}

-	xl := obj.(*xlObjects)
+	xl := obj.(xlObjects)

 	err = obj.MakeBucket("bucket")
 	if err != nil {
@@ -436,9 +412,8 @@ func TestFormatXLReorderByInspection(t *testing.T) {

 	bucket := "bucket"
 	object := "object"
-	sha256sum := ""

-	_, err = obj.PutObject(bucket, object, int64(len("abcd")), bytes.NewReader([]byte("abcd")), nil, sha256sum)
+	_, err = obj.PutObject(bucket, object, int64(len("abcd")), bytes.NewReader([]byte("abcd")), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -475,7 +450,7 @@ func TestFormatXLReorderByInspection(t *testing.T) {
 			t.Fatal("should not be nil")
 		}
 		if orderedDisks[i] != nil && orderedDisks[i] != xl.storageDisks[i] {
-			t.Fatal("Disks were not ordered correctly")
+			t.Fatal("Disks were not ordered correctly.")
 		}
 	}

@@ -559,7 +534,7 @@ func TestSavedUUIDOrder(t *testing.T) {
 	jbod := make([]string, 8)
 	formatConfigs := make([]*formatConfigV1, 8)
 	for index := range jbod {
-		jbod[index] = mustGetUUID()
+		jbod[index] = getUUID()
 		uuidTestCases[index].uuid = jbod[index]
 		uuidTestCases[index].shouldPass = true
 	}
@@ -594,28 +569,18 @@ func TestSavedUUIDOrder(t *testing.T) {

 // Test initFormatXL() when disks are expected to return errors
 func TestInitFormatXLErrors(t *testing.T) {
-	nDisks := 16
-	fsDirs, err := getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer removeRoots(fsDirs)
-	endpoints, err := parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
 	// Create an instance of xl backend.
-	obj, _, err := initObjectLayer(endpoints)
+	obj, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl := obj.(*xlObjects)
+	xl := obj.(xlObjects)

 	testStorageDisks := make([]StorageAPI, 16)

 	// All disks API return disk not found
 	for i := 0; i < 16; i++ {
-		d := xl.storageDisks[i].(*retryStorage)
+		d := xl.storageDisks[i].(*posix)
 		testStorageDisks[i] = &naughtyDisk{disk: d, defaultErr: errDiskNotFound}
 	}
 	if err := initFormatXL(testStorageDisks); err != errDiskNotFound {
@@ -624,7 +589,7 @@ func TestInitFormatXLErrors(t *testing.T) {

 	// All disks returns disk not found in the fourth call
 	for i := 0; i < 15; i++ {
-		d := xl.storageDisks[i].(*retryStorage)
+		d := xl.storageDisks[i].(*posix)
 		testStorageDisks[i] = &naughtyDisk{disk: d, defaultErr: errDiskNotFound, errors: map[int]error{0: nil, 1: nil, 2: nil}}
 	}
 	if err := initFormatXL(testStorageDisks); err != errDiskNotFound {
@@ -638,6 +603,8 @@ func TestInitFormatXLErrors(t *testing.T) {
 	if err := initFormatXL(testStorageDisks); err != errDiskNotFound {
 		t.Fatal("Got a different error: ", err)
 	}
+
+	removeRoots(fsDirs)
 }

 // Test for reduceFormatErrs()
@@ -648,19 +615,19 @@ func TestReduceFormatErrs(t *testing.T) {
 	}
 	// One corrupted format
 	if err := reduceFormatErrs([]error{nil, nil, errCorruptedFormat, nil}, 4); err != errCorruptedFormat {
-		t.Fatal("Got a different error: ", err)
+		t.Fatal("Got a differnt error: ", err)
 	}
 	// All disks unformatted
 	if err := reduceFormatErrs([]error{errUnformattedDisk, errUnformattedDisk, errUnformattedDisk, errUnformattedDisk}, 4); err != errUnformattedDisk {
-		t.Fatal("Got a different error: ", err)
+		t.Fatal("Got a differnt error: ", err)
 	}
 	// Some disks unformatted
 	if err := reduceFormatErrs([]error{nil, nil, errUnformattedDisk, errUnformattedDisk}, 4); err != errSomeDiskUnformatted {
-		t.Fatal("Got a different error: ", err)
+		t.Fatal("Got a differnt error: ", err)
 	}
 	// Some disks offline
 	if err := reduceFormatErrs([]error{nil, nil, errDiskNotFound, errUnformattedDisk}, 4); err != errSomeDiskOffline {
-		t.Fatal("Got a different error: ", err)
+		t.Fatal("Got a differnt error: ", err)
 	}
 }

@@ -688,92 +655,56 @@ func TestGenericFormatCheck(t *testing.T) {
 	if err := genericFormatCheck(formatConfigs, errs); err == nil {
 		t.Fatalf("Should fail here")
 	}
-	errs = []error{nil}
-	if err := genericFormatCheck([]*formatConfigV1{genFormatFS()}, errs); err != nil {
-		t.Fatal("Got unexpected err: ", err)
-	}
-	errs = []error{errFaultyDisk}
-	if err := genericFormatCheck([]*formatConfigV1{genFormatFS()}, errs); err == nil {
-		t.Fatalf("Should fail here")
-	}
+
 }

 func TestLoadFormatXLErrs(t *testing.T) {
-	nDisks := 16
-	fsDirs, err := getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer removeRoots(fsDirs)
-
-	endpoints, err := parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
 	// Create an instance of xl backend.
-	obj, _, err := initObjectLayer(endpoints)
+	obj, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl := obj.(*xlObjects)
+	xl := obj.(xlObjects)

 	xl.storageDisks[11] = nil

 	// disk 12 returns faulty disk
-	posixDisk, ok := xl.storageDisks[12].(*retryStorage)
+	posixDisk, ok := xl.storageDisks[12].(*posix)
 	if !ok {
-		t.Fatal("storage disk is not *retryStorage type")
+		t.Fatal("storage disk is not *posix type")
 	}
 	xl.storageDisks[10] = newNaughtyDisk(posixDisk, nil, errFaultyDisk)
-	if _, err = loadFormatXL(xl.storageDisks, 8); err != errFaultyDisk {
+	if _, err = loadFormatXL(xl.storageDisks); err != errFaultyDisk {
 		t.Fatal("Got an unexpected error: ", err)
 	}

 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer removeRoots(fsDirs)
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	obj, _, err = initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal(err)
-	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)

 	// disks 0..10 returns disk not found
 	for i := 0; i <= 10; i++ {
-		posixDisk, ok := xl.storageDisks[i].(*retryStorage)
+		posixDisk, ok := xl.storageDisks[i].(*posix)
 		if !ok {
-			t.Fatal("storage disk is not *retryStorage type")
+			t.Fatal("storage disk is not *posix type")
 		}
 		xl.storageDisks[i] = newNaughtyDisk(posixDisk, nil, errDiskNotFound)
 	}
-	if _, err = loadFormatXL(xl.storageDisks, 8); err != errXLReadQuorum {
+	if _, err = loadFormatXL(xl.storageDisks); err != errXLReadQuorum {
 		t.Fatal("Got an unexpected error: ", err)
 	}

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer removeRoots(fsDirs)
+	removeRoots(fsDirs)

-	endpoints, err = parseStorageEndpoints(fsDirs)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	obj, _, err = initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal(err)
-	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)

 	// disks 0..10 returns unformatted disk
 	for i := 0; i <= 10; i++ {
@@ -781,82 +712,48 @@ func TestLoadFormatXLErrs(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	if _, err = loadFormatXL(xl.storageDisks, 8); err != errUnformattedDisk {
-		t.Fatal("Got an unexpected error: ", err)
-	}
-
-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer removeRoots(fsDirs)
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	obj, _, err = initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal(err)
-	}
-	xl = obj.(*xlObjects)
-
-	// disks 0..15 returns is nil (disk not found)
-	for i := 0; i < 16; i++ {
-		xl.storageDisks[i] = nil
-	}
-	if _, err := loadFormatXL(xl.storageDisks, 8); err != errDiskNotFound {
-		t.Fatal("Got an unexpected error: ", err)
-	}
-}
-
-// Tests for healFormatXLCorruptedDisks() with cases which lead to errors
-func TestHealFormatXLCorruptedDisksErrs(t *testing.T) {
-	root, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer removeAll(root)
-
-	nDisks := 16
-	fsDirs, err := getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err := parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Everything is fine, should return nil
-	obj, _, err := initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal(err)
-	}
-	xl := obj.(*xlObjects)
-	if err = healFormatXLCorruptedDisks(xl.storageDisks); err != nil {
+	if _, err = loadFormatXL(xl.storageDisks); err != errUnformattedDisk {
 		t.Fatal("Got an unexpected error: ", err)
 	}

 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
+	xl = obj.(xlObjects)
+
+	// disks 0..15 returns is nil (disk not found)
+	for i := 0; i < 16; i++ {
+		xl.storageDisks[i] = nil
+	}
+	if _, err := loadFormatXL(xl.storageDisks); err != errDiskNotFound {
+		t.Fatal("Got an unexpected error: ", err)
+	}

-	endpoints, err = parseStorageEndpoints(fsDirs)
+	removeRoots(fsDirs)
+}
+
+// Tests for healFormatXLCorruptedDisks() with cases which lead to errors
+func TestHealFormatXLCorruptedDisksErrs(t *testing.T) {
+	// Everything is fine, should return nil
+	obj, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
+	xl := obj.(xlObjects)
+	if err = healFormatXLCorruptedDisks(xl.storageDisks); err != nil {
+		t.Fatal("Got an unexpected error: ", err)
+	}
+	removeRoots(fsDirs)

 	// Disks 0..15 are nil
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)
 	for i := 0; i <= 15; i++ {
 		xl.storageDisks[i] = nil
 	}
@@ -865,25 +762,15 @@ func TestHealFormatXLCorruptedDisksErrs(t *testing.T) {
 	}
 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// One disk returns Faulty Disk
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
-	posixDisk, ok := xl.storageDisks[0].(*retryStorage)
+	xl = obj.(xlObjects)
+	posixDisk, ok := xl.storageDisks[0].(*posix)
 	if !ok {
-		t.Fatal("storage disk is not *retryStorage type")
+		t.Fatal("storage disk is not *posix type")
 	}
 	xl.storageDisks[0] = newNaughtyDisk(posixDisk, nil, errFaultyDisk)
 	if err = healFormatXLCorruptedDisks(xl.storageDisks); err != errFaultyDisk {
@@ -891,44 +778,24 @@ func TestHealFormatXLCorruptedDisksErrs(t *testing.T) {
 	}
 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// One disk is not found, heal corrupted disks should return nil
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)
 	xl.storageDisks[0] = nil
 	if err = healFormatXLCorruptedDisks(xl.storageDisks); err != nil {
 		t.Fatal("Got an unexpected error: ", err)
 	}
 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// Remove format.json of all disks
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)
 	for i := 0; i <= 15; i++ {
 		if err = xl.storageDisks[i].DeleteFile(".minio.sys", "format.json"); err != nil {
 			t.Fatal(err)
@@ -939,22 +806,12 @@ func TestHealFormatXLCorruptedDisksErrs(t *testing.T) {
 	}
 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// Corrupted format json in one disk
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)
 	for i := 0; i <= 15; i++ {
 		if err = xl.storageDisks[i].AppendFile(".minio.sys", "format.json", []byte("corrupted data")); err != nil {
 			t.Fatal(err)
@@ -968,50 +825,23 @@ func TestHealFormatXLCorruptedDisksErrs(t *testing.T) {

 // Tests for healFormatXLFreshDisks() with cases which lead to errors
 func TestHealFormatXLFreshDisksErrs(t *testing.T) {
-	root, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer removeAll(root)
-
-	nDisks := 16
-	fsDirs, err := getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err := parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// Everything is fine, should return nil
-	obj, _, err := initObjectLayer(endpoints)
+	obj, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl := obj.(*xlObjects)
+	xl := obj.(xlObjects)
 	if err = healFormatXLFreshDisks(xl.storageDisks); err != nil {
 		t.Fatal("Got an unexpected error: ", err)
 	}
 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// Disks 0..15 are nil
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)
 	for i := 0; i <= 15; i++ {
 		xl.storageDisks[i] = nil
 	}
@@ -1020,25 +850,15 @@ func TestHealFormatXLFreshDisksErrs(t *testing.T) {
 	}
 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// One disk returns Faulty Disk
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
-	posixDisk, ok := xl.storageDisks[0].(*retryStorage)
+	xl = obj.(xlObjects)
+	posixDisk, ok := xl.storageDisks[0].(*posix)
 	if !ok {
-		t.Fatal("storage disk is not *retryStorage type")
+		t.Fatal("storage disk is not *posix type")
 	}
 	xl.storageDisks[0] = newNaughtyDisk(posixDisk, nil, errFaultyDisk)
 	if err = healFormatXLFreshDisks(xl.storageDisks); err != errFaultyDisk {
@@ -1046,44 +866,24 @@ func TestHealFormatXLFreshDisksErrs(t *testing.T) {
 	}
 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// One disk is not found, heal corrupted disks should return nil
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)
 	xl.storageDisks[0] = nil
 	if err = healFormatXLFreshDisks(xl.storageDisks); err != nil {
 		t.Fatal("Got an unexpected error: ", err)
 	}
 	removeRoots(fsDirs)

-	fsDirs, err = getRandomDisks(nDisks)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	endpoints, err = parseStorageEndpoints(fsDirs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// Remove format.json of all disks
-	obj, _, err = initObjectLayer(endpoints)
+	obj, fsDirs, err = getXLObjectLayer()
 	if err != nil {
 		t.Fatal(err)
 	}
-	xl = obj.(*xlObjects)
+	xl = obj.(xlObjects)
 	for i := 0; i <= 15; i++ {
 		if err = xl.storageDisks[i].DeleteFile(".minio.sys", "format.json"); err != nil {
 			t.Fatal(err)
@@ -1093,6 +893,23 @@ func TestHealFormatXLFreshDisksErrs(t *testing.T) {
 		t.Fatal("Got an unexpected error: ", err)
 	}
 	removeRoots(fsDirs)
+
+	// Remove format.json of all disks
+	obj, fsDirs, err = getXLObjectLayer()
+	if err != nil {
+		t.Fatal(err)
+	}
+	xl = obj.(xlObjects)
+	for i := 0; i <= 15; i++ {
+		if err = xl.storageDisks[i].DeleteFile(".minio.sys", "format.json"); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if err = healFormatXLFreshDisks(xl.storageDisks); err != nil {
+		t.Fatal("Got an unexpected error: ", err)
+	}
+	removeRoots(fsDirs)
+
 }

 // Tests for isFormatFound()
@@ -24,13 +24,13 @@ func fsCreateFile(disk StorageAPI, reader io.Reader, buf []byte, tmpBucket, temp
 	for {
 		n, rErr := reader.Read(buf)
 		if rErr != nil && rErr != io.EOF {
-			return 0, traceError(rErr)
+			return 0, rErr
 		}
 		bytesWritten += int64(n)
 		if n > 0 {
 			wErr := disk.AppendFile(tmpBucket, tempObj, buf[0:n])
 			if wErr != nil {
-				return 0, traceError(wErr)
+				return 0, wErr
 			}
 		}
 		if rErr == io.EOF {
@@ -1,211 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"errors"
-	"reflect"
-	"sync"
-	"time"
-)
-
-// Error sent by appendParts go-routine when there are holes in parts.
-// For ex. let's say client uploads part-2 before part-1 in which case we
-// can not append and have to wait till part-1 is uploaded. Hence we return
-// this error. Currently this error is not used in the caller.
-var errPartsMissing = errors.New("required parts missing")
-
-// Error sent when appendParts go-routine has waited long enough and timedout.
-var errAppendPartsTimeout = errors.New("appendParts goroutine timeout")
-
-// Timeout value for the appendParts go-routine.
-var appendPartsTimeout = 24 * 60 * 60 * time.Second // 24 hours.
-
-// Holds a map of uploadID->appendParts go-routine
-type backgroundAppend struct {
-	infoMap map[string]bgAppendPartsInfo
-	sync.Mutex
-}
-
-// Input to the appendParts go-routine
-type bgAppendPartsInput struct {
-	meta  fsMetaV1   // list of parts that need to be appended
-	errCh chan error // error sent by appendParts go-routine
-}
-
-// Identifies an appendParts go-routine.
-type bgAppendPartsInfo struct {
-	inputCh    chan bgAppendPartsInput
-	timeoutCh  chan struct{} // closed by appendParts go-routine when it timesout
-	abortCh    chan struct{} // closed after abort of upload to end the appendParts go-routine
-	completeCh chan struct{} // closed after complete of upload to end the appendParts go-routine
-}
-
-// Called after a part is uploaded so that it can be appended in the background.
-func (b *backgroundAppend) append(disk StorageAPI, bucket, object, uploadID string, meta fsMetaV1) chan error {
-	b.Lock()
-	info, ok := b.infoMap[uploadID]
-	if !ok {
-		// Corresponding appendParts go-routine was not found, create a new one. Would happen when the first
-		// part of a multipart upload is uploaded.
-		inputCh := make(chan bgAppendPartsInput)
-		timeoutCh := make(chan struct{})
-		abortCh := make(chan struct{})
-		completeCh := make(chan struct{})
-
-		info = bgAppendPartsInfo{inputCh, timeoutCh, abortCh, completeCh}
-		b.infoMap[uploadID] = info
-
-		go b.appendParts(disk, bucket, object, uploadID, info)
-	}
-	b.Unlock()
-	errCh := make(chan error)
-	go func() {
-		// send input in a goroutine as send on the inputCh can block if appendParts go-routine
-		// is busy appending a part.
-		select {
-		case <-info.timeoutCh:
-			// This is to handle a rare race condition where we found info in b.infoMap
-			// but soon after that appendParts go-routine timed out.
-			errCh <- errAppendPartsTimeout
-		case info.inputCh <- bgAppendPartsInput{meta, errCh}:
-		}
-	}()
-	return errCh
-}
-
-// Called on complete-multipart-upload. Returns nil if the required parts have been appended.
-func (b *backgroundAppend) complete(disk StorageAPI, bucket, object, uploadID string, meta fsMetaV1) error {
-	b.Lock()
-	info, ok := b.infoMap[uploadID]
-	delete(b.infoMap, uploadID)
-	b.Unlock()
-	if !ok {
-		return errPartsMissing
-	}
-	errCh := make(chan error)
-	select {
-	case <-info.timeoutCh:
-		// This is to handle a rare race condition where we found info in b.infoMap
-		// but soon after that appendParts go-routine timedouted out.
-		return errAppendPartsTimeout
-	case info.inputCh <- bgAppendPartsInput{meta, errCh}:
-	}
-	err := <-errCh
-
-	close(info.completeCh)
-
-	return err
-}
-
-// Called after complete-multipart-upload or abort-multipart-upload so that the appendParts go-routine is not left dangling.
-func (b *backgroundAppend) abort(uploadID string) {
-	b.Lock()
-	defer b.Unlock()
-	info, ok := b.infoMap[uploadID]
-	if !ok {
-		return
-	}
-	delete(b.infoMap, uploadID)
-	close(info.abortCh)
-}
-
-// This is run as a go-routine that appends the parts in the background.
-func (b *backgroundAppend) appendParts(disk StorageAPI, bucket, object, uploadID string, info bgAppendPartsInfo) {
-	// Holds the list of parts that is already appended to the "append" file.
-	appendMeta := fsMetaV1{}
-	for {
-		select {
-		case input := <-info.inputCh:
-			// We receive on this channel when new part gets uploaded or when complete-multipart sends
-			// a value on this channel to confirm if all the required parts are appended.
-			meta := input.meta
-			for {
-				// Append should be done such a way that if part-3 and part-2 is uploaded before part-1, we
-				// wait till part-1 is uploaded after which we append part-2 and part-3 as well in this for-loop.
-				part, appendNeeded := partToAppend(meta, appendMeta)
-				if !appendNeeded {
-					if reflect.DeepEqual(meta.Parts, appendMeta.Parts) {
-						// Sending nil is useful so that the complete-multipart-upload knows that
-						// all the required parts have been appended.
-						input.errCh <- nil
-					} else {
-						// Sending error is useful so that complete-multipart-upload can fall-back to
-						// its own append process.
-						input.errCh <- errPartsMissing
-					}
-					break
-				}
-				if err := appendPart(disk, bucket, object, uploadID, part); err != nil {
-					disk.DeleteFile(minioMetaTmpBucket, uploadID)
-					appendMeta.Parts = nil
-					input.errCh <- err
-					break
-				}
-				appendMeta.AddObjectPart(part.Number, part.Name, part.ETag, part.Size)
-			}
-		case <-info.abortCh:
-			// abort-multipart-upload closed abortCh to end the appendParts go-routine.
-			disk.DeleteFile(minioMetaTmpBucket, uploadID)
-			return
-		case <-info.completeCh:
-			// complete-multipart-upload closed completeCh to end the appendParts go-routine.
-			return
-		case <-time.After(appendPartsTimeout):
-			// Timeout the goroutine to garbage collect its resources. This would happen if the client initiates
-			// a multipart upload and does not complete/abort it.
-			b.Lock()
-			delete(b.infoMap, uploadID)
-			b.Unlock()
-			// Delete the temporary append file as well.
-			disk.DeleteFile(minioMetaTmpBucket, uploadID)
-
-			close(info.timeoutCh)
-			return
-		}
-	}
-}
-
-// Appends the "part" to the append-file inside "tmp/" that finally gets moved to the actual location
-// upon complete-multipart-upload.
-func appendPart(disk StorageAPI, bucket, object, uploadID string, part objectPartInfo) error {
-	partPath := pathJoin(bucket, object, uploadID, part.Name)
-
-	offset := int64(0)
-	totalLeft := part.Size
-	buf := make([]byte, readSizeV1)
-	for totalLeft > 0 {
-		curLeft := int64(readSizeV1)
-		if totalLeft < readSizeV1 {
-			curLeft = totalLeft
-		}
-		n, err := disk.ReadFile(minioMetaMultipartBucket, partPath, offset, buf[:curLeft])
-		if err != nil {
-			// Check for EOF/ErrUnexpectedEOF not needed as it should never happen as we know
-			// the exact size of the file and hence know the size of buf[]
-			// EOF/ErrUnexpectedEOF indicates that the length of file was shorter than part.Size and
-			// hence considered as an error condition.
-			return err
-		}
-		if err = disk.AppendFile(minioMetaTmpBucket, uploadID, buf[:n]); err != nil {
-			return err
-		}
-		offset += n
-		totalLeft -= n
-	}
-	return nil
-}
@@ -19,4 +19,4 @@ package cmd
 import "errors"

 // errFSDiskFormat - returned when given disk format is other than FS format.
-var errFSDiskFormat = errors.New("Disk is not in FS format")
+var errFSDiskFormat = errors.New("Disk is not in FS format.")
@@ -18,7 +18,10 @@ package cmd

 import (
 	"encoding/json"
+	"os"
+	"path"
 	"sort"
+	"strings"
 )

 const (
@@ -78,12 +81,12 @@ func readFSMetadata(disk StorageAPI, bucket, filePath string) (fsMeta fsMetaV1,
 	// Read all `fs.json`.
 	buf, err := disk.ReadAll(bucket, filePath)
 	if err != nil {
-		return fsMetaV1{}, traceError(err)
+		return fsMetaV1{}, err
 	}

 	// Decode `fs.json` into fsMeta structure.
 	if err = json.Unmarshal(buf, &fsMeta); err != nil {
-		return fsMetaV1{}, traceError(err)
+		return fsMetaV1{}, err
 	}

 	// Success.
@@ -91,23 +94,16 @@ func readFSMetadata(disk StorageAPI, bucket, filePath string) (fsMeta fsMetaV1,
 }

 // Write fsMeta to fs.json or fs-append.json.
-func writeFSMetadata(disk StorageAPI, bucket, filePath string, fsMeta fsMetaV1) error {
-	tmpPath := mustGetUUID()
+func writeFSMetadata(disk StorageAPI, bucket, filePath string, fsMeta fsMetaV1) (err error) {
+	tmpPath := path.Join(tmpMetaPrefix, getUUID())
 	metadataBytes, err := json.Marshal(fsMeta)
 	if err != nil {
-		return traceError(err)
+		return err
 	}
-	if err = disk.AppendFile(minioMetaTmpBucket, tmpPath, metadataBytes); err != nil {
-		return traceError(err)
+	if err = disk.AppendFile(minioMetaBucket, tmpPath, metadataBytes); err != nil {
+		return err
 	}
-	err = disk.RenameFile(minioMetaTmpBucket, tmpPath, bucket, filePath)
-	if err != nil {
-		err = disk.DeleteFile(minioMetaTmpBucket, tmpPath)
-		if err != nil {
-			return traceError(err)
-		}
-	}
-	return nil
+	return disk.RenameFile(minioMetaBucket, tmpPath, bucket, filePath)
 }

 // newFSMetaV1 - initializes new fsMetaV1.
@@ -120,8 +116,8 @@ func newFSMetaV1() (fsMeta fsMetaV1) {
 }

 // newFSFormatV1 - initializes new formatConfigV1 with FS format info.
-func newFSFormatV1() (format *formatConfigV1) {
-	return &formatConfigV1{
+func newFSFormatV1() (format formatConfigV1) {
+	return formatConfigV1{
 		Version: "1",
 		Format:  "fs",
 		FS: &fsFormat{
@@ -131,12 +127,12 @@ func newFSFormatV1() (format *formatConfigV1) {
 }

 // isFSFormat - returns whether given formatConfigV1 is FS type or not.
-func isFSFormat(format *formatConfigV1) bool {
+func isFSFormat(format formatConfigV1) bool {
 	return format.Format == "fs"
 }

 // writes FS format (format.json) into minioMetaBucket.
-func saveFSFormatData(storage StorageAPI, fsFormat *formatConfigV1) error {
+func writeFSFormatData(storage StorageAPI, fsFormat formatConfigV1) error {
 	metadataBytes, err := json.Marshal(fsFormat)
 	if err != nil {
 		return err
@@ -161,3 +157,32 @@ func isPartsSame(uploadedParts []objectPartInfo, completeParts []completePart) b
 	}
 	return true
 }
+
+var extendedHeaders = []string{
+	"X-Amz-Meta-",
+	"X-Minio-Meta-",
+	// Add new extended headers.
+}
+
+// isExtendedHeader validates if input string matches extended headers.
+func isExtendedHeader(header string) bool {
+	for _, extendedHeader := range extendedHeaders {
+		if strings.HasPrefix(header, extendedHeader) {
+			return true
+		}
+	}
+	return false
+}
+
+// Return true if extended HTTP headers are set, false otherwise.
+func hasExtendedHeader(metadata map[string]string) bool {
+	if os.Getenv("MINIO_ENABLE_FSMETA") == "1" {
+		return true
+	}
+	for k := range metadata {
+		if isExtendedHeader(k) {
+			return true
+		}
+	}
+	return false
+}
@@ -17,108 +17,50 @@
 package cmd

 import (
-	"bytes"
 	"os"
-	"path/filepath"
 	"testing"
 )

-func initFSObjects(disk string, t *testing.T) (obj ObjectLayer) {
-	endpoints, err := parseStorageEndpoints([]string{disk})
-	if err != nil {
-		t.Fatal(err)
-	}
-	obj, _, err = initObjectLayer(endpoints)
-	if err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-	return obj
-}
-
-// TestReadFsMetadata - readFSMetadata testing with a healthy and faulty disk
-func TestReadFSMetadata(t *testing.T) {
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-
-	fs := obj.(fsObjects)
-
-	bucketName := "bucket"
-	objectName := "object"
-
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-	sha256sum := ""
-	if _, err := obj.PutObject(bucketName, objectName, int64(len("abcd")), bytes.NewReader([]byte("abcd")),
-		map[string]string{"X-Amz-Meta-AppId": "a"}, sha256sum); err != nil {
-		t.Fatal("Unexpected err: ", err)
+// Tests scenarios which can occur for hasExtendedHeader function.
+func TestHasExtendedHeader(t *testing.T) {
+	// All test cases concerning hasExtendedHeader function.
+	testCases := []struct {
+		metadata map[string]string
+		has      bool
+	}{
+		// Verifies if X-Amz-Meta is present.
+		{
+			metadata: map[string]string{
+				"X-Amz-Meta-1": "value",
+			},
+			has: true || os.Getenv("MINIO_ENABLE_FSMETA") == "1",
+		},
+		// Verifies if X-Minio-Meta is present.
+		{
+			metadata: map[string]string{
+				"X-Minio-Meta-1": "value",
+			},
+			has: true || os.Getenv("MINIO_ENABLE_FSMETA") == "1",
+		},
+		// Verifies if extended header is not present.
+		{
+			metadata: map[string]string{
+				"md5Sum": "value",
+			},
+			has: false || os.Getenv("MINIO_ENABLE_FSMETA") == "1",
+		},
+		// Verifies if extended header is not present, but with an empty input.
+		{
+			metadata: nil,
+			has:      false || os.Getenv("MINIO_ENABLE_FSMETA") == "1",
+		},
 	}

-	// Construct the full path of fs.json
-	fsPath := "buckets/" + bucketName + "/" + objectName + "/fs.json"
-
-	// Regular fs metadata reading, no errors expected
-	if _, err := readFSMetadata(fs.storage, ".minio.sys", fsPath); err != nil {
-		t.Fatal("Unexpected error ", err)
-	}
-
-	// Corrupted fs.json
-	if err := fs.storage.AppendFile(".minio.sys", fsPath, []byte{'a'}); err != nil {
-		t.Fatal("Unexpected error ", err)
-	}
-	if _, err := readFSMetadata(fs.storage, ".minio.sys", fsPath); err == nil {
-		t.Fatal("Should fail", err)
-	}
-
-	// Test with corrupted disk
-	fsStorage := fs.storage.(*retryStorage)
-	naughty := newNaughtyDisk(fsStorage, nil, errFaultyDisk)
-	fs.storage = naughty
-	if _, err := readFSMetadata(fs.storage, ".minio.sys", fsPath); errorCause(err) != errFaultyDisk {
-		t.Fatal("Should fail", err)
-	}
-
-}
-
-// TestWriteFsMetadata - tests of writeFSMetadata with healthy and faulty disks
-func TestWriteFSMetadata(t *testing.T) {
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-
-	bucketName := "bucket"
-	objectName := "object"
-
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-	sha256sum := ""
-	if _, err := obj.PutObject(bucketName, objectName, int64(len("abcd")), bytes.NewReader([]byte("abcd")),
-		map[string]string{"X-Amz-Meta-AppId": "a"}, sha256sum); err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-
-	// Construct the complete path of fs.json
-	fsPath := "buckets/" + bucketName + "/" + objectName + "/fs.json"
-
-	// Fs metadata reading, no errors expected (healthy disk)
-	fsMeta, err := readFSMetadata(fs.storage, ".minio.sys", fsPath)
-	if err != nil {
-		t.Fatal("Unexpected error ", err)
-	}
-
-	// Reading metadata with a corrupted disk
-	fsStorage := fs.storage.(*retryStorage)
-	for i := 1; i <= 2; i++ {
-		naughty := newNaughtyDisk(fsStorage, map[int]error{i: errFaultyDisk, i + 1: errFaultyDisk}, nil)
-		fs.storage = naughty
-		if err = writeFSMetadata(fs.storage, ".minio.sys", fsPath, fsMeta); errorCause(err) != errFaultyDisk {
-			t.Fatal("Unexpected error", i, err)
-
+	// Validate all test cases.
+	for i, testCase := range testCases {
+		has := hasExtendedHeader(testCase.metadata)
+		if has != testCase.has {
+			t.Fatalf("Test case %d: Expected \"%#v\", but got \"%#v\"", i+1, testCase.has, has)
 		}
 	}
-
 }
@@ -17,6 +17,7 @@
 package cmd

 import (
+	"encoding/json"
 	"path"
 	"time"
 )
@@ -43,60 +44,69 @@ func (fs fsObjects) isBucketExist(bucket string) bool {

 // isUploadIDExists - verify if a given uploadID exists and is valid.
 func (fs fsObjects) isUploadIDExists(bucket, object, uploadID string) bool {
-	uploadIDPath := path.Join(bucket, object, uploadID)
-	_, err := fs.storage.StatFile(minioMetaMultipartBucket, path.Join(uploadIDPath, fsMetaJSONFile))
+	uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID)
+	_, err := fs.storage.StatFile(minioMetaBucket, path.Join(uploadIDPath, fsMetaJSONFile))
 	if err != nil {
 		if err == errFileNotFound {
 			return false
 		}
-		errorIf(err, "Unable to access upload id "+pathJoin(minioMetaMultipartBucket, uploadIDPath))
+		errorIf(err, "Unable to access upload id"+uploadIDPath)
 		return false
 	}
 	return true
 }

-// updateUploadJSON - add or remove upload ID info in all `uploads.json`.
-func (fs fsObjects) updateUploadJSON(bucket, object, uploadID string, initiated time.Time, isRemove bool) error {
-	uploadsPath := path.Join(bucket, object, uploadsJSONFile)
-	tmpUploadsPath := mustGetUUID()
-
-	uploadsJSON, err := readUploadsJSON(bucket, object, fs.storage)
-	if errorCause(err) == errFileNotFound {
-		// If file is not found, we assume a default (empty)
-		// upload info.
-		uploadsJSON, err = newUploadsV1("fs"), nil
-	}
+// writeUploadJSON - create `uploads.json` or update it with new uploadID.
+func (fs fsObjects) writeUploadJSON(bucket, object, uploadID string, initiated time.Time) (err error) {
+	uploadsPath := path.Join(mpartMetaPrefix, bucket, object, uploadsJSONFile)
+	uniqueID := getUUID()
+	tmpUploadsPath := path.Join(tmpMetaPrefix, uniqueID)
+	var uploadsJSON uploadsV1
+	uploadsJSON, err = readUploadsJSON(bucket, object, fs.storage)
 	if err != nil {
-		return err
-	}
-
-	// update the uploadsJSON struct
-	if !isRemove {
-		// Add the uploadID
-		uploadsJSON.AddUploadID(uploadID, initiated)
-	} else {
-		// Remove the upload ID
-		uploadsJSON.RemoveUploadID(uploadID)
-	}
-
-	// update the file or delete it?
-	if len(uploadsJSON.Uploads) > 0 {
-		err = writeUploadJSON(&uploadsJSON, uploadsPath, tmpUploadsPath, fs.storage)
-	} else {
-		// no uploads, so we delete the file.
-		if err = fs.storage.DeleteFile(minioMetaMultipartBucket, uploadsPath); err != nil {
-			return toObjectErr(traceError(err), minioMetaMultipartBucket, uploadsPath)
+		// For any other errors.
+		if err != errFileNotFound {
+			return err
 		}
+		// Set uploads format to `fs`.
+		uploadsJSON = newUploadsV1("fs")
 	}
-	return err
+	// Add a new upload id.
+	uploadsJSON.AddUploadID(uploadID, initiated)
+
+	// Update `uploads.json` on all disks.
+	uploadsJSONBytes, wErr := json.Marshal(&uploadsJSON)
+	if wErr != nil {
+		return wErr
+	}
+	// Write `uploads.json` to disk.
+	if wErr = fs.storage.AppendFile(minioMetaBucket, tmpUploadsPath, uploadsJSONBytes); wErr != nil {
+		return wErr
+	}
+	wErr = fs.storage.RenameFile(minioMetaBucket, tmpUploadsPath, minioMetaBucket, uploadsPath)
+	if wErr != nil {
+		if dErr := fs.storage.DeleteFile(minioMetaBucket, tmpUploadsPath); dErr != nil {
+			return dErr
+		}
+		return wErr
+	}
+	return nil
 }

-// addUploadID - add upload ID and its initiated time to 'uploads.json'.
-func (fs fsObjects) addUploadID(bucket, object string, uploadID string, initiated time.Time) error {
-	return fs.updateUploadJSON(bucket, object, uploadID, initiated, false)
-}
-
-// removeUploadID - remove upload ID in 'uploads.json'.
-func (fs fsObjects) removeUploadID(bucket, object string, uploadID string) error {
-	return fs.updateUploadJSON(bucket, object, uploadID, time.Time{}, true)
+// updateUploadsJSON - update `uploads.json` with new uploadsJSON for all disks.
+func (fs fsObjects) updateUploadsJSON(bucket, object string, uploadsJSON uploadsV1) (err error) {
+	uploadsPath := path.Join(mpartMetaPrefix, bucket, object, uploadsJSONFile)
+	uniqueID := getUUID()
+	tmpUploadsPath := path.Join(tmpMetaPrefix, uniqueID)
+	uploadsBytes, wErr := json.Marshal(uploadsJSON)
+	if wErr != nil {
+		return wErr
+	}
+	if wErr = fs.storage.AppendFile(minioMetaBucket, tmpUploadsPath, uploadsBytes); wErr != nil {
+		return wErr
+	}
+	if wErr = fs.storage.RenameFile(minioMetaBucket, tmpUploadsPath, minioMetaBucket, uploadsPath); wErr != nil {
+		return wErr
+	}
+	return nil
 }
@@ -1,138 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-// TestFSIsBucketExist - complete test of isBucketExist
-func TestFSIsBucketExist(t *testing.T) {
-	// Prepare for testing
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-	bucketName := "bucket"
-
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Cannot create bucket, err: ", err)
-	}
-
-	// Test with a valid bucket
-	if found := fs.isBucketExist(bucketName); !found {
-		t.Fatal("isBucketExist should true")
-	}
-
-	// Test with a inexistant bucket
-	if found := fs.isBucketExist("foo"); found {
-		t.Fatal("isBucketExist should false")
-	}
-
-	// Using a faulty disk
-	fsStorage := fs.storage.(*retryStorage)
-	naughty := newNaughtyDisk(fsStorage, nil, errFaultyDisk)
-	fs.storage = naughty
-	if found := fs.isBucketExist(bucketName); found {
-		t.Fatal("isBucketExist should return false because it is wired to a corrupted disk")
-	}
-}
-
-// TestFSIsUploadExists - complete test with valid and invalid cases
-func TestFSIsUploadExists(t *testing.T) {
-	// Prepare for testing
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-
-	bucketName := "bucket"
-	objectName := "object"
-
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-
-	uploadID, err := obj.NewMultipartUpload(bucketName, objectName, nil)
-	if err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-	// Test with valid upload id
-	if exists := fs.isUploadIDExists(bucketName, objectName, uploadID); !exists {
-		t.Fatal("Wrong result, expected: ", exists)
-	}
-
-	// Test with inexistant bucket/object names
-	if exists := fs.isUploadIDExists("bucketfoo", "objectfoo", uploadID); exists {
-		t.Fatal("Wrong result, expected: ", !exists)
-	}
-
-	// Test with inexistant upload ID
-	if exists := fs.isUploadIDExists(bucketName, objectName, uploadID+"-ff"); exists {
-		t.Fatal("Wrong result, expected: ", !exists)
-	}
-
-	// isUploadIdExists with a faulty disk should return false
-	fsStorage := fs.storage.(*retryStorage)
-	naughty := newNaughtyDisk(fsStorage, nil, errFaultyDisk)
-	fs.storage = naughty
-	if exists := fs.isUploadIDExists(bucketName, objectName, uploadID); exists {
-		t.Fatal("Wrong result, expected: ", !exists)
-	}
-}
-
-// TestFSWriteUploadJSON - tests for writeUploadJSON for FS
-func TestFSWriteUploadJSON(t *testing.T) {
-	// Prepare for tests
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-
-	bucketName := "bucket"
-	objectName := "object"
-
-	obj.MakeBucket(bucketName)
-	uploadID, err := obj.NewMultipartUpload(bucketName, objectName, nil)
-	if err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-
-	if err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-
-	if err := fs.addUploadID(bucketName, objectName, uploadID, time.Now().UTC()); err != nil {
-		t.Fatal("Unexpected err: ", err)
-	}
-
-	// isUploadIdExists with a faulty disk should return false
-	fsStorage := fs.storage.(*retryStorage)
-	for i := 1; i <= 3; i++ {
-		naughty := newNaughtyDisk(fsStorage, map[int]error{i: errFaultyDisk}, nil)
-		fs.storage = naughty
-		if err := fs.addUploadID(bucketName, objectName, uploadID, time.Now().UTC()); errorCause(err) != errFaultyDisk {
-			t.Fatal("Unexpected err: ", err)
-		}
-	}
-}
@@ -18,13 +18,13 @@ package cmd

 import (
 	"crypto/md5"
-	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
-	"hash"
 	"io"
 	"path"
+	"strconv"
 	"strings"
+	"sync"
 	"time"

 	"github.com/skyrings/skyring-common/tools/uuid"
@@ -45,7 +45,7 @@ func (fs fsObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
 	result.Delimiter = delimiter

 	// Not using path.Join() as it strips off the trailing '/'.
-	multipartPrefixPath := pathJoin(bucket, prefix)
+	multipartPrefixPath := pathJoin(mpartMetaPrefix, bucket, prefix)
 	if prefix == "" {
 		// Should have a trailing "/" if prefix is ""
 		// For ex. multipartPrefixPath should be "multipart/bucket/" if prefix is ""
@@ -53,17 +53,15 @@ func (fs fsObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
 	}
 	multipartMarkerPath := ""
 	if keyMarker != "" {
-		multipartMarkerPath = pathJoin(bucket, keyMarker)
+		multipartMarkerPath = pathJoin(mpartMetaPrefix, bucket, keyMarker)
 	}
 	var uploads []uploadMetadata
 	var err error
 	var eof bool
 	if uploadIDMarker != "" {
-		keyMarkerLock := nsMutex.NewNSLock(minioMetaMultipartBucket,
-			pathJoin(bucket, keyMarker))
-		keyMarkerLock.RLock()
+		nsMutex.RLock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, keyMarker))
 		uploads, _, err = listMultipartUploadIDs(bucket, keyMarker, uploadIDMarker, maxUploads, fs.storage)
-		keyMarkerLock.RUnlock()
+		nsMutex.RUnlock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, keyMarker))
 		if err != nil {
 			return ListMultipartsInfo{}, err
 		}
@@ -73,12 +71,12 @@ func (fs fsObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
 	var endWalkCh chan struct{}
 	heal := false // true only for xl.ListObjectsHeal()
 	if maxUploads > 0 {
-		walkResultCh, endWalkCh = fs.listPool.Release(listParams{minioMetaMultipartBucket, recursive, multipartMarkerPath, multipartPrefixPath, heal})
+		walkResultCh, endWalkCh = fs.listPool.Release(listParams{minioMetaBucket, recursive, multipartMarkerPath, multipartPrefixPath, heal})
 		if walkResultCh == nil {
 			endWalkCh = make(chan struct{})
 			isLeaf := fs.isMultipartUpload
-			listDir := listDirFactory(isLeaf, fsTreeWalkIgnoredErrs, fs.storage)
-			walkResultCh = startTreeWalk(minioMetaMultipartBucket, multipartPrefixPath, multipartMarkerPath, recursive, listDir, isLeaf, endWalkCh)
+			listDir := listDirFactory(isLeaf, fs.storage)
+			walkResultCh = startTreeWalk(minioMetaBucket, multipartPrefixPath, multipartMarkerPath, recursive, listDir, isLeaf, endWalkCh)
 		}
 		for maxUploads > 0 {
 			walkResult, ok := <-walkResultCh
@@ -90,13 +88,13 @@ func (fs fsObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
 			// For any walk error return right away.
 			if walkResult.err != nil {
 				// File not found or Disk not found is a valid case.
-				if isErrIgnored(walkResult.err, fsTreeWalkIgnoredErrs) {
+				if isErrIgnored(walkResult.err, walkResultIgnoredErrs) {
 					eof = true
 					break
 				}
-				return ListMultipartsInfo{}, walkResult.err
+				return ListMultipartsInfo{}, err
 			}
-			entry := strings.TrimPrefix(walkResult.entry, retainSlash(bucket))
+			entry := strings.TrimPrefix(walkResult.entry, retainSlash(pathJoin(mpartMetaPrefix, bucket)))
 			if strings.HasSuffix(walkResult.entry, slashSeparator) {
 				uploads = append(uploads, uploadMetadata{
 					Object: entry,
@@ -113,12 +111,9 @@ func (fs fsObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
 			var tmpUploads []uploadMetadata
 			var end bool
 			uploadIDMarker = ""
-
-			entryLock := nsMutex.NewNSLock(minioMetaMultipartBucket,
-				pathJoin(bucket, entry))
-			entryLock.RLock()
+			nsMutex.RLock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, entry))
 			tmpUploads, end, err = listMultipartUploadIDs(bucket, entry, uploadIDMarker, maxUploads, fs.storage)
-			entryLock.RUnlock()
+			nsMutex.RUnlock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, entry))
 			if err != nil {
 				return ListMultipartsInfo{}, err
 			}
@@ -174,42 +169,42 @@ func (fs fsObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
 func (fs fsObjects) ListMultipartUploads(bucket, prefix, keyMarker, uploadIDMarker, delimiter string, maxUploads int) (ListMultipartsInfo, error) {
 	// Validate input arguments.
 	if !IsValidBucketName(bucket) {
-		return ListMultipartsInfo{}, traceError(BucketNameInvalid{Bucket: bucket})
+		return ListMultipartsInfo{}, BucketNameInvalid{Bucket: bucket}
 	}
 	if !fs.isBucketExist(bucket) {
-		return ListMultipartsInfo{}, traceError(BucketNotFound{Bucket: bucket})
+		return ListMultipartsInfo{}, BucketNotFound{Bucket: bucket}
 	}
 	if !IsValidObjectPrefix(prefix) {
-		return ListMultipartsInfo{}, traceError(ObjectNameInvalid{Bucket: bucket, Object: prefix})
+		return ListMultipartsInfo{}, ObjectNameInvalid{Bucket: bucket, Object: prefix}
 	}
 	// Verify if delimiter is anything other than '/', which we do not support.
 	if delimiter != "" && delimiter != slashSeparator {
-		return ListMultipartsInfo{}, traceError(UnsupportedDelimiter{
+		return ListMultipartsInfo{}, UnsupportedDelimiter{
 			Delimiter: delimiter,
-		})
+		}
 	}
 	// Verify if marker has prefix.
 	if keyMarker != "" && !strings.HasPrefix(keyMarker, prefix) {
-		return ListMultipartsInfo{}, traceError(InvalidMarkerPrefixCombination{
+		return ListMultipartsInfo{}, InvalidMarkerPrefixCombination{
 			Marker: keyMarker,
 			Prefix: prefix,
-		})
+		}
 	}
 	if uploadIDMarker != "" {
 		if strings.HasSuffix(keyMarker, slashSeparator) {
-			return ListMultipartsInfo{}, traceError(InvalidUploadIDKeyCombination{
+			return ListMultipartsInfo{}, InvalidUploadIDKeyCombination{
 				UploadIDMarker: uploadIDMarker,
 				KeyMarker:      keyMarker,
-			})
+			}
 		}
 		id, err := uuid.Parse(uploadIDMarker)
 		if err != nil {
-			return ListMultipartsInfo{}, traceError(err)
+			return ListMultipartsInfo{}, err
 		}
 		if id.IsZero() {
-			return ListMultipartsInfo{}, traceError(MalformedUploadID{
+			return ListMultipartsInfo{}, MalformedUploadID{
 				UploadID: uploadIDMarker,
-			})
+			}
 		}
 	}
 	return fs.listMultipartUploads(bucket, prefix, keyMarker, uploadIDMarker, delimiter, maxUploads)
@@ -219,32 +214,31 @@ func (fs fsObjects) ListMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
 // request, returns back a unique upload id.
 //
 // Internally this function creates 'uploads.json' associated for the
-// incoming object at '.minio.sys/multipart/bucket/object/uploads.json' on
+// incoming object at '.minio/multipart/bucket/object/uploads.json' on
 // all the disks. `uploads.json` carries metadata regarding on going
 // multipart operation on the object.
 func (fs fsObjects) newMultipartUpload(bucket string, object string, meta map[string]string) (uploadID string, err error) {
 	// Initialize `fs.json` values.
 	fsMeta := newFSMetaV1()

-	// Save additional metadata.
-	fsMeta.Meta = meta
+	// Save additional metadata only if extended headers such as "X-Amz-Meta-" are set.
+	if hasExtendedHeader(meta) {
+		fsMeta.Meta = meta
+	}

-	// This lock needs to be held for any changes to the directory
-	// contents of ".minio.sys/multipart/object/"
-	objectMPartPathLock := nsMutex.NewNSLock(minioMetaMultipartBucket,
-		pathJoin(bucket, object))
-	objectMPartPathLock.Lock()
-	defer objectMPartPathLock.Unlock()
+	// This lock needs to be held for any changes to the directory contents of ".minio/multipart/object/"
+	nsMutex.Lock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object))
+	defer nsMutex.Unlock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object))

-	uploadID = mustGetUUID()
+	uploadID = getUUID()
 	initiated := time.Now().UTC()
-	// Add upload ID to uploads.json
-	if err = fs.addUploadID(bucket, object, uploadID, initiated); err != nil {
+	// Create 'uploads.json'
+	if err = fs.writeUploadJSON(bucket, object, uploadID, initiated); err != nil {
 		return "", err
 	}
-	uploadIDPath := path.Join(bucket, object, uploadID)
-	if err = writeFSMetadata(fs.storage, minioMetaMultipartBucket, path.Join(uploadIDPath, fsMetaJSONFile), fsMeta); err != nil {
-		return "", toObjectErr(err, minioMetaMultipartBucket, uploadIDPath)
+	fsMetaPath := path.Join(mpartMetaPrefix, bucket, object, uploadID, fsMetaJSONFile)
+	if err = writeFSMetadata(fs.storage, minioMetaBucket, fsMetaPath, fsMeta); err != nil {
+		return "", toObjectErr(err, minioMetaBucket, fsMetaPath)
 	}
 	// Return success.
 	return uploadID, nil
@@ -258,15 +252,15 @@ func (fs fsObjects) newMultipartUpload(bucket string, object string, meta map[st
 func (fs fsObjects) NewMultipartUpload(bucket, object string, meta map[string]string) (string, error) {
 	// Verify if bucket name is valid.
 	if !IsValidBucketName(bucket) {
-		return "", traceError(BucketNameInvalid{Bucket: bucket})
+		return "", BucketNameInvalid{Bucket: bucket}
 	}
 	// Verify whether the bucket exists.
 	if !fs.isBucketExist(bucket) {
-		return "", traceError(BucketNotFound{Bucket: bucket})
+		return "", BucketNotFound{Bucket: bucket}
 	}
 	// Verify if object name is valid.
 	if !IsValidObjectName(object) {
-		return "", traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
+		return "", ObjectNameInvalid{Bucket: bucket, Object: object}
 	}
 	return fs.newMultipartUpload(bucket, object, meta)
 }
@@ -285,48 +279,169 @@ func partToAppend(fsMeta fsMetaV1, fsAppendMeta fsMetaV1) (part objectPartInfo,
 	return fsMeta.Parts[nextPartIndex], true
 }

+// Returns metadata path for the file holding info about the parts that
+// have been appended to the "append-file"
+func getFSAppendMetaPath(uploadID string) string {
+	return path.Join(tmpMetaPrefix, uploadID+".json")
+}
+
+// Returns path for the append-file.
+func getFSAppendDataPath(uploadID string) string {
+	return path.Join(tmpMetaPrefix, uploadID+".data")
+}
+
+// Parts pool shared buffer.
+var appendPartsBufPool = sync.Pool{
+	New: func() interface{} {
+		b := make([]byte, readSizeV1)
+		return &b
+	},
+}
+
+// Append parts to fsAppendDataFile.
+func appendParts(disk StorageAPI, bucket, object, uploadID string) {
+	uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID)
+	// fs-append.json path
+	fsAppendMetaPath := getFSAppendMetaPath(uploadID)
+	// fs.json path
+	fsMetaPath := path.Join(mpartMetaPrefix, bucket, object, uploadID, fsMetaJSONFile)
+
+	// Lock the uploadID so that no one modifies fs.json
+	nsMutex.RLock(minioMetaBucket, uploadIDPath)
+	fsMeta, err := readFSMetadata(disk, minioMetaBucket, fsMetaPath)
+	nsMutex.RUnlock(minioMetaBucket, uploadIDPath)
+	if err != nil {
+		return
+	}
+
+	// Lock fs-append.json so that there is no parallel append to the file.
+	nsMutex.Lock(minioMetaBucket, fsAppendMetaPath)
+	defer nsMutex.Unlock(minioMetaBucket, fsAppendMetaPath)
+
+	fsAppendMeta, err := readFSMetadata(disk, minioMetaBucket, fsAppendMetaPath)
+	if err != nil {
+		if err != errFileNotFound {
+			return
+		}
+		fsAppendMeta = fsMeta
+		fsAppendMeta.Parts = nil
+	}
+
+	// Check if a part needs to be appended to
+	part, appendNeeded := partToAppend(fsMeta, fsAppendMeta)
+	if !appendNeeded {
+		return
+	}
+	// Hold write lock on the part so that there is no parallel upload on the part.
+	nsMutex.Lock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object, uploadID, strconv.Itoa(part.Number)))
+	defer nsMutex.Unlock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object, uploadID, strconv.Itoa(part.Number)))
+
+	// Proceed to append "part"
+	fsAppendDataPath := getFSAppendDataPath(uploadID)
+	tmpDataPath := path.Join(tmpMetaPrefix, getUUID())
+	if part.Number != 1 {
+		// Move it to tmp location before appending so that we don't leave inconsitent data
+		// if server crashes during append operation.
+		err = disk.RenameFile(minioMetaBucket, fsAppendDataPath, minioMetaBucket, tmpDataPath)
+		if err != nil {
+			return
+		}
+		// Delete fs-append.json so that we don't leave a stale file if server crashes
+		// when the part is being appended to the tmp file.
+		err = disk.DeleteFile(minioMetaBucket, fsAppendMetaPath)
+		if err != nil {
+			return
+		}
+	}
+	// Path to the part that needs to be appended.
+	partPath := path.Join(mpartMetaPrefix, bucket, object, uploadID, part.Name)
+	offset := int64(0)
+	totalLeft := part.Size
+
+	// Get buffer from parts pool.
+	bufp := appendPartsBufPool.Get().(*[]byte)
+	buf := *bufp
+	for totalLeft > 0 {
+		curLeft := int64(readSizeV1)
+		if totalLeft < readSizeV1 {
+			curLeft = totalLeft
+		}
+		var n int64
+		n, err = disk.ReadFile(minioMetaBucket, partPath, offset, buf[:curLeft])
+		if n > 0 {
+			if err = disk.AppendFile(minioMetaBucket, tmpDataPath, buf[:n]); err != nil {
+				return
+			}
+		}
+		if err != nil {
+			if err == io.EOF || err == io.ErrUnexpectedEOF {
+				break
+			}
+			return
+		}
+		offset += n
+		totalLeft -= n
+	}
+	appendPartsBufPool.Put(bufp)
+
+	// All good, the part has been appended to the tmp file, rename it back.
+	if err = disk.RenameFile(minioMetaBucket, tmpDataPath, minioMetaBucket, fsAppendDataPath); err != nil {
+		errorIf(err, "Unable to rename %s to %s", tmpDataPath, fsAppendDataPath)
+		return
+	}
+	fsAppendMeta.AddObjectPart(part.Number, part.Name, part.ETag, part.Size)
+	if err = writeFSMetadata(disk, minioMetaBucket, fsAppendMetaPath, fsAppendMeta); err != nil {
+		errorIf(err, "Unable to write FS metadata %s", fsAppendMetaPath)
+		return
+	}
+	// If there are more parts that need to be appended to fsAppendDataFile
+	_, appendNeeded = partToAppend(fsMeta, fsAppendMeta)
+	if appendNeeded {
+		go appendParts(disk, bucket, object, uploadID)
+	}
+}
+
+// Parts pool shared buffer.
+var partsBufPool = sync.Pool{
+	New: func() interface{} {
+		b := make([]byte, readSizeV1)
+		return &b
+	},
+}
+
 // PutObjectPart - reads incoming data until EOF for the part file on
 // an ongoing multipart transaction. Internally incoming data is
-// written to '.minio.sys/tmp' location and safely renamed to
-// '.minio.sys/multipart' for reach parts.
-func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, size int64, data io.Reader, md5Hex string, sha256sum string) (string, error) {
+// written to '.minio/tmp' location and safely renamed to
+// '.minio/multipart' for reach parts.
+func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, size int64, data io.Reader, md5Hex string) (string, error) {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return "", traceError(BucketNameInvalid{Bucket: bucket})
+		return "", BucketNameInvalid{Bucket: bucket}
 	}
 	// Verify whether the bucket exists.
 	if !fs.isBucketExist(bucket) {
-		return "", traceError(BucketNotFound{Bucket: bucket})
+		return "", BucketNotFound{Bucket: bucket}
 	}
 	if !IsValidObjectName(object) {
-		return "", traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
+		return "", ObjectNameInvalid{Bucket: bucket, Object: object}
 	}

-	uploadIDPath := path.Join(bucket, object, uploadID)
+	uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID)

-	preUploadIDLock := nsMutex.NewNSLock(minioMetaMultipartBucket, uploadIDPath)
-	preUploadIDLock.RLock()
+	nsMutex.RLock(minioMetaBucket, uploadIDPath)
 	// Just check if the uploadID exists to avoid copy if it doesn't.
 	uploadIDExists := fs.isUploadIDExists(bucket, object, uploadID)
-	preUploadIDLock.RUnlock()
+	nsMutex.RUnlock(minioMetaBucket, uploadIDPath)
 	if !uploadIDExists {
-		return "", traceError(InvalidUploadID{UploadID: uploadID})
+		return "", InvalidUploadID{UploadID: uploadID}
 	}

 	partSuffix := fmt.Sprintf("object%d", partID)
-	tmpPartPath := uploadID + "." + mustGetUUID() + "." + partSuffix
+	tmpPartPath := path.Join(tmpMetaPrefix, uploadID+"."+getUUID()+"."+partSuffix)

 	// Initialize md5 writer.
 	md5Writer := md5.New()

-	hashWriters := []io.Writer{md5Writer}
-
-	var sha256Writer hash.Hash
-	if sha256sum != "" {
-		sha256Writer = sha256.New()
-		hashWriters = append(hashWriters, sha256Writer)
-	}
-	multiWriter := io.MultiWriter(hashWriters...)
 	// Limit the reader to its provided size if specified.
 	var limitDataReader io.Reader
 	if size > 0 {
@@ -337,106 +452,87 @@ func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, s
 		limitDataReader = data
 	}

-	teeReader := io.TeeReader(limitDataReader, multiWriter)
+	teeReader := io.TeeReader(limitDataReader, md5Writer)
 	bufSize := int64(readSizeV1)
 	if size > 0 && bufSize > size {
 		bufSize = size
 	}
-	buf := make([]byte, int(bufSize))
+	bufp := partsBufPool.Get().(*[]byte)
+	buf := *bufp
+	defer partsBufPool.Put(bufp)

-	if size > 0 {
-		// Prepare file to avoid disk fragmentation
-		err := fs.storage.PrepareFile(minioMetaTmpBucket, tmpPartPath, size)
-		if err != nil {
-			return "", toObjectErr(err, minioMetaTmpBucket, tmpPartPath)
-		}
-	}
-
-	bytesWritten, cErr := fsCreateFile(fs.storage, teeReader, buf, minioMetaTmpBucket, tmpPartPath)
+	bytesWritten, cErr := fsCreateFile(fs.storage, teeReader, buf[:bufSize], minioMetaBucket, tmpPartPath)
 	if cErr != nil {
-		fs.storage.DeleteFile(minioMetaTmpBucket, tmpPartPath)
-		return "", toObjectErr(cErr, minioMetaTmpBucket, tmpPartPath)
+		fs.storage.DeleteFile(minioMetaBucket, tmpPartPath)
+		return "", toObjectErr(cErr, minioMetaBucket, tmpPartPath)
 	}
 	// Should return IncompleteBody{} error when reader has fewer
 	// bytes than specified in request header.
 	if bytesWritten < size {
-		fs.storage.DeleteFile(minioMetaTmpBucket, tmpPartPath)
-		return "", traceError(IncompleteBody{})
+		fs.storage.DeleteFile(minioMetaBucket, tmpPartPath)
+		return "", IncompleteBody{}
 	}

-	// Delete temporary part in case of failure. If
-	// PutObjectPart succeeds then there would be nothing to
-	// delete.
-	defer fs.storage.DeleteFile(minioMetaTmpBucket, tmpPartPath)
+	// Validate if payload is valid.
+	if isSignVerify(data) {
+		if err := data.(*signVerifyReader).Verify(); err != nil {
+			// Incoming payload wrong, delete the temporary object.
+			fs.storage.DeleteFile(minioMetaBucket, tmpPartPath)
+			// Error return.
+			return "", toObjectErr(err, bucket, object)
+		}
+	}

 	newMD5Hex := hex.EncodeToString(md5Writer.Sum(nil))
 	if md5Hex != "" {
 		if newMD5Hex != md5Hex {
-			return "", traceError(BadDigest{md5Hex, newMD5Hex})
-		}
-	}
-
-	if sha256sum != "" {
-		newSHA256sum := hex.EncodeToString(sha256Writer.Sum(nil))
-		if newSHA256sum != sha256sum {
-			return "", traceError(SHA256Mismatch{})
+			// MD5 mismatch, delete the temporary object.
+			fs.storage.DeleteFile(minioMetaBucket, tmpPartPath)
+			// Returns md5 mismatch.
+			return "", BadDigest{md5Hex, newMD5Hex}
 		}
 	}

 	// Hold write lock as we are updating fs.json
-	postUploadIDLock := nsMutex.NewNSLock(minioMetaMultipartBucket, uploadIDPath)
-	postUploadIDLock.Lock()
-	defer postUploadIDLock.Unlock()
+	nsMutex.Lock(minioMetaBucket, uploadIDPath)
+	defer nsMutex.Unlock(minioMetaBucket, uploadIDPath)

 	// Just check if the uploadID exists to avoid copy if it doesn't.
 	if !fs.isUploadIDExists(bucket, object, uploadID) {
-		return "", traceError(InvalidUploadID{UploadID: uploadID})
+		return "", InvalidUploadID{UploadID: uploadID}
 	}

 	fsMetaPath := pathJoin(uploadIDPath, fsMetaJSONFile)
-	fsMeta, err := readFSMetadata(fs.storage, minioMetaMultipartBucket, fsMetaPath)
+	fsMeta, err := readFSMetadata(fs.storage, minioMetaBucket, fsMetaPath)
 	if err != nil {
-		return "", toObjectErr(err, minioMetaMultipartBucket, fsMetaPath)
+		return "", toObjectErr(err, minioMetaBucket, fsMetaPath)
 	}
 	fsMeta.AddObjectPart(partID, partSuffix, newMD5Hex, size)

-	partPath := path.Join(bucket, object, uploadID, partSuffix)
-	// Lock the part so that another part upload with same part-number gets blocked
-	// while the part is getting appended in the background.
-	partLock := nsMutex.NewNSLock(minioMetaMultipartBucket, partPath)
-	partLock.Lock()
-	err = fs.storage.RenameFile(minioMetaTmpBucket, tmpPartPath, minioMetaMultipartBucket, partPath)
+	partPath := path.Join(mpartMetaPrefix, bucket, object, uploadID, partSuffix)
+	err = fs.storage.RenameFile(minioMetaBucket, tmpPartPath, minioMetaBucket, partPath)
 	if err != nil {
-		partLock.Unlock()
-		return "", toObjectErr(traceError(err), minioMetaMultipartBucket, partPath)
-	}
-	uploadIDPath = path.Join(bucket, object, uploadID)
-	if err = writeFSMetadata(fs.storage, minioMetaMultipartBucket, path.Join(uploadIDPath, fsMetaJSONFile), fsMeta); err != nil {
-		partLock.Unlock()
-		return "", toObjectErr(err, minioMetaMultipartBucket, uploadIDPath)
+		if dErr := fs.storage.DeleteFile(minioMetaBucket, tmpPartPath); dErr != nil {
+			return "", toObjectErr(dErr, minioMetaBucket, tmpPartPath)
+		}
+		return "", toObjectErr(err, minioMetaBucket, partPath)
 	}

-	go func() {
-		// Append the part in background.
-		errCh := fs.bgAppend.append(fs.storage, bucket, object, uploadID, fsMeta)
-		// Also receive the error so that the appendParts go-routine does not block on send.
-		// But the error received is ignored as fs.PutObjectPart() would have already
-		// returned success to the client.
-		<-errCh
-		partLock.Unlock()
-	}()
-
+	if err = writeFSMetadata(fs.storage, minioMetaBucket, fsMetaPath, fsMeta); err != nil {
+		return "", toObjectErr(err, minioMetaBucket, fsMetaPath)
+	}
+	go appendParts(fs.storage, bucket, object, uploadID)
 	return newMD5Hex, nil
 }

 // listObjectParts - wrapper scanning through
-// '.minio.sys/multipart/bucket/object/UPLOADID'. Lists all the parts
-// saved inside '.minio.sys/multipart/bucket/object/UPLOADID'.
+// '.minio/multipart/bucket/object/UPLOADID'. Lists all the parts
+// saved inside '.minio/multipart/bucket/object/UPLOADID'.
 func (fs fsObjects) listObjectParts(bucket, object, uploadID string, partNumberMarker, maxParts int) (ListPartsInfo, error) {
 	result := ListPartsInfo{}

-	fsMetaPath := path.Join(bucket, object, uploadID, fsMetaJSONFile)
-	fsMeta, err := readFSMetadata(fs.storage, minioMetaMultipartBucket, fsMetaPath)
+	fsMetaPath := path.Join(mpartMetaPrefix, bucket, object, uploadID, fsMetaJSONFile)
+	fsMeta, err := readFSMetadata(fs.storage, minioMetaBucket, fsMetaPath)
 	if err != nil {
 		return ListPartsInfo{}, toObjectErr(err, minioMetaBucket, fsMetaPath)
 	}
@@ -449,10 +545,10 @@ func (fs fsObjects) listObjectParts(bucket, object, uploadID string, partNumberM
 	count := maxParts
 	for _, part := range parts {
 		var fi FileInfo
-		partNamePath := path.Join(bucket, object, uploadID, part.Name)
-		fi, err = fs.storage.StatFile(minioMetaMultipartBucket, partNamePath)
+		partNamePath := path.Join(mpartMetaPrefix, bucket, object, uploadID, part.Name)
+		fi, err = fs.storage.StatFile(minioMetaBucket, partNamePath)
 		if err != nil {
-			return ListPartsInfo{}, toObjectErr(traceError(err), minioMetaMultipartBucket, partNamePath)
+			return ListPartsInfo{}, toObjectErr(err, minioMetaBucket, partNamePath)
 		}
 		result.Parts = append(result.Parts, partInfo{
 			PartNumber:   part.Number,
@@ -490,39 +586,31 @@ func (fs fsObjects) listObjectParts(bucket, object, uploadID string, partNumberM
 func (fs fsObjects) ListObjectParts(bucket, object, uploadID string, partNumberMarker, maxParts int) (ListPartsInfo, error) {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return ListPartsInfo{}, traceError(BucketNameInvalid{Bucket: bucket})
+		return ListPartsInfo{}, BucketNameInvalid{Bucket: bucket}
 	}
 	// Verify whether the bucket exists.
 	if !fs.isBucketExist(bucket) {
-		return ListPartsInfo{}, traceError(BucketNotFound{Bucket: bucket})
+		return ListPartsInfo{}, BucketNotFound{Bucket: bucket}
 	}
 	if !IsValidObjectName(object) {
-		return ListPartsInfo{}, traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
+		return ListPartsInfo{}, ObjectNameInvalid{Bucket: bucket, Object: object}
 	}
-
-	// Hold lock so that there is no competing
-	// abort-multipart-upload or complete-multipart-upload.
-	uploadIDLock := nsMutex.NewNSLock(minioMetaMultipartBucket,
-		pathJoin(bucket, object, uploadID))
-	uploadIDLock.Lock()
-	defer uploadIDLock.Unlock()
+	// Hold lock so that there is no competing abort-multipart-upload or complete-multipart-upload.
+	nsMutex.Lock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object, uploadID))
+	defer nsMutex.Unlock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object, uploadID))

 	if !fs.isUploadIDExists(bucket, object, uploadID) {
-		return ListPartsInfo{}, traceError(InvalidUploadID{UploadID: uploadID})
+		return ListPartsInfo{}, InvalidUploadID{UploadID: uploadID}
 	}
 	return fs.listObjectParts(bucket, object, uploadID, partNumberMarker, maxParts)
 }

-func (fs fsObjects) totalObjectSize(fsMeta fsMetaV1, parts []completePart) (int64, error) {
-	objSize := int64(0)
-	for _, part := range parts {
-		partIdx := fsMeta.ObjectPartIndex(part.PartNumber)
-		if partIdx == -1 {
-			return 0, InvalidPart{}
-		}
-		objSize += fsMeta.Parts[partIdx].Size
-	}
-	return objSize, nil
+// Complete multipart pool shared buffer.
+var completeBufPool = sync.Pool{
+	New: func() interface{} {
+		b := make([]byte, readSizeV1)
+		return &b
+	},
 }

 // CompleteMultipartUpload - completes an ongoing multipart
@@ -534,97 +622,85 @@ func (fs fsObjects) totalObjectSize(fsMeta fsMetaV1, parts []completePart) (int6
 func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, uploadID string, parts []completePart) (string, error) {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return "", traceError(BucketNameInvalid{Bucket: bucket})
+		return "", BucketNameInvalid{Bucket: bucket}
 	}
 	// Verify whether the bucket exists.
 	if !fs.isBucketExist(bucket) {
-		return "", traceError(BucketNotFound{Bucket: bucket})
+		return "", BucketNotFound{Bucket: bucket}
 	}
 	if !IsValidObjectName(object) {
-		return "", traceError(ObjectNameInvalid{
+		return "", ObjectNameInvalid{
 			Bucket: bucket,
 			Object: object,
-		})
+		}
 	}

-	uploadIDPath := path.Join(bucket, object, uploadID)
-
+	uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID)
 	// Hold lock so that
 	// 1) no one aborts this multipart upload
 	// 2) no one does a parallel complete-multipart-upload on this
 	// multipart upload
-	uploadIDLock := nsMutex.NewNSLock(minioMetaMultipartBucket, uploadIDPath)
-	uploadIDLock.Lock()
-	defer uploadIDLock.Unlock()
+	nsMutex.Lock(minioMetaBucket, uploadIDPath)
+	defer nsMutex.Unlock(minioMetaBucket, uploadIDPath)

 	if !fs.isUploadIDExists(bucket, object, uploadID) {
-		return "", traceError(InvalidUploadID{UploadID: uploadID})
+		return "", InvalidUploadID{UploadID: uploadID}
 	}

+	// fs-append.json path
+	fsAppendMetaPath := getFSAppendMetaPath(uploadID)
+	// Lock fs-append.json so that no parallel appendParts() is being done.
+	nsMutex.Lock(minioMetaBucket, fsAppendMetaPath)
+	defer nsMutex.Unlock(minioMetaBucket, fsAppendMetaPath)
+
 	// Calculate s3 compatible md5sum for complete multipart.
-	s3MD5, err := getCompleteMultipartMD5(parts)
+	s3MD5, err := completeMultipartMD5(parts...)
 	if err != nil {
 		return "", err
 	}

 	// Read saved fs metadata for ongoing multipart.
 	fsMetaPath := pathJoin(uploadIDPath, fsMetaJSONFile)
-	fsMeta, err := readFSMetadata(fs.storage, minioMetaMultipartBucket, fsMetaPath)
+	fsMeta, err := readFSMetadata(fs.storage, minioMetaBucket, fsMetaPath)
 	if err != nil {
-		return "", toObjectErr(err, minioMetaMultipartBucket, fsMetaPath)
+		return "", toObjectErr(err, minioMetaBucket, fsMetaPath)
 	}

-	appendFallback := true // In case background-append did not append the required parts.
-	if isPartsSame(fsMeta.Parts, parts) {
-		err = fs.bgAppend.complete(fs.storage, bucket, object, uploadID, fsMeta)
-		if err == nil {
-			appendFallback = false
-			if err = fs.storage.RenameFile(minioMetaTmpBucket, uploadID, bucket, object); err != nil {
-				return "", toObjectErr(traceError(err), minioMetaTmpBucket, uploadID)
-			}
+	fsAppendMeta, err := readFSMetadata(fs.storage, minioMetaBucket, fsAppendMetaPath)
+	if err == nil && isPartsSame(fsAppendMeta.Parts, parts) {
+		fsAppendDataPath := getFSAppendDataPath(uploadID)
+		if err = fs.storage.RenameFile(minioMetaBucket, fsAppendDataPath, bucket, object); err != nil {
+			return "", toObjectErr(err, minioMetaBucket, fsAppendDataPath)
 		}
-	}
+		// Remove the append-file metadata file in tmp location as we no longer need it.
+		fs.storage.DeleteFile(minioMetaBucket, fsAppendMetaPath)
+	} else {
+		tempObj := path.Join(tmpMetaPrefix, uploadID+"-"+"part.1")

-	if appendFallback {
-		// background append could not do append all the required parts, hence we do it here.
-		tempObj := uploadID + "-" + "part.1"
-
-		// Allocate staging buffer.
-		var buf = make([]byte, readSizeV1)
-		var objSize int64
-
-		objSize, err = fs.totalObjectSize(fsMeta, parts)
-		if err != nil {
-			return "", traceError(err)
-		}
-		if objSize > 0 {
-			// Prepare file to avoid disk fragmentation
-			err = fs.storage.PrepareFile(minioMetaTmpBucket, tempObj, objSize)
-			if err != nil {
-				return "", traceError(err)
-			}
-		}
+		bufp := completeBufPool.Get().(*[]byte)
+		buf := *bufp
+		defer completeBufPool.Put(bufp)

 		// Loop through all parts, validate them and then commit to disk.
 		for i, part := range parts {
 			partIdx := fsMeta.ObjectPartIndex(part.PartNumber)
 			if partIdx == -1 {
-				return "", traceError(InvalidPart{})
+				return "", InvalidPart{}
 			}
 			if fsMeta.Parts[partIdx].ETag != part.ETag {
-				return "", traceError(BadDigest{})
+				return "", BadDigest{}
 			}
 			// All parts except the last part has to be atleast 5MB.
 			if (i < len(parts)-1) && !isMinAllowedPartSize(fsMeta.Parts[partIdx].Size) {
-				return "", traceError(PartTooSmall{
+				return "", PartTooSmall{
 					PartNumber: part.PartNumber,
 					PartSize:   fsMeta.Parts[partIdx].Size,
 					PartETag:   part.ETag,
-				})
+				}
 			}
 			// Construct part suffix.
 			partSuffix := fmt.Sprintf("object%d", part.PartNumber)
-			multipartPartFile := path.Join(bucket, object, uploadID, partSuffix)
+			multipartPartFile := path.Join(mpartMetaPrefix, bucket, object, uploadID, partSuffix)
 			offset := int64(0)
 			totalLeft := fsMeta.Parts[partIdx].Size
 			for totalLeft > 0 {
@@ -633,10 +709,10 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
 					curLeft = totalLeft
 				}
 				var n int64
-				n, err = fs.storage.ReadFile(minioMetaMultipartBucket, multipartPartFile, offset, buf[:curLeft])
+				n, err = fs.storage.ReadFile(minioMetaBucket, multipartPartFile, offset, buf[:curLeft])
 				if n > 0 {
-					if err = fs.storage.AppendFile(minioMetaTmpBucket, tempObj, buf[:n]); err != nil {
-						return "", toObjectErr(traceError(err), minioMetaTmpBucket, tempObj)
+					if err = fs.storage.AppendFile(minioMetaBucket, tempObj, buf[:n]); err != nil {
+						return "", toObjectErr(err, minioMetaBucket, tempObj)
 					}
 				}
 				if err != nil {
@@ -644,9 +720,9 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
 						break
 					}
 					if err == errFileNotFound {
-						return "", traceError(InvalidPart{})
+						return "", InvalidPart{}
 					}
-					return "", toObjectErr(traceError(err), minioMetaMultipartBucket, multipartPartFile)
+					return "", toObjectErr(err, minioMetaBucket, multipartPartFile)
 				}
 				offset += n
 				totalLeft -= n
@@ -654,28 +730,29 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
 		}

 		// Rename the file back to original location, if not delete the temporary object.
-		err = fs.storage.RenameFile(minioMetaTmpBucket, tempObj, bucket, object)
+		err = fs.storage.RenameFile(minioMetaBucket, tempObj, bucket, object)
 		if err != nil {
-			if dErr := fs.storage.DeleteFile(minioMetaTmpBucket, tempObj); dErr != nil {
-				return "", toObjectErr(traceError(dErr), minioMetaTmpBucket, tempObj)
+			if dErr := fs.storage.DeleteFile(minioMetaBucket, tempObj); dErr != nil {
+				return "", toObjectErr(dErr, minioMetaBucket, tempObj)
 			}
-			return "", toObjectErr(traceError(err), bucket, object)
+			return "", toObjectErr(err, bucket, object)
 		}
 	}

 	// No need to save part info, since we have concatenated all parts.
 	fsMeta.Parts = nil

-	// Save additional metadata.
-	if len(fsMeta.Meta) == 0 {
-		fsMeta.Meta = make(map[string]string)
-	}
-	fsMeta.Meta["md5Sum"] = s3MD5
+	// Save additional metadata only if extended headers such as "X-Amz-Meta-" are set.
+	if hasExtendedHeader(fsMeta.Meta) {
+		if len(fsMeta.Meta) == 0 {
+			fsMeta.Meta = make(map[string]string)
+		}
+		fsMeta.Meta["md5Sum"] = s3MD5

-	fsMetaPath = path.Join(bucketMetaPrefix, bucket, object, fsMetaJSONFile)
-	// Write the metadata to a temp file and rename it to the actual location.
-	if err = writeFSMetadata(fs.storage, minioMetaBucket, fsMetaPath, fsMeta); err != nil {
-		return "", toObjectErr(err, bucket, object)
+		fsMetaPath = path.Join(bucketMetaPrefix, bucket, object, fsMetaJSONFile)
+		if err = writeFSMetadata(fs.storage, minioMetaBucket, fsMetaPath, fsMeta); err != nil {
+			return "", toObjectErr(err, bucket, object)
+		}
 	}

 	// Cleanup all the parts if everything else has been safely committed.
@@ -683,17 +760,33 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
 		return "", toObjectErr(err, bucket, object)
 	}

-	// Hold the lock so that two parallel
-	// complete-multipart-uploads do not leave a stale
-	// uploads.json behind.
-	objectMPartPathLock := nsMutex.NewNSLock(minioMetaMultipartBucket,
-		pathJoin(bucket, object))
-	objectMPartPathLock.Lock()
-	defer objectMPartPathLock.Unlock()
+	// Hold the lock so that two parallel complete-multipart-uploads do not
+	// leave a stale uploads.json behind.
+	nsMutex.Lock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object))
+	defer nsMutex.Unlock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object))

-	// remove entry from uploads.json
-	if err := fs.removeUploadID(bucket, object, uploadID); err != nil {
-		return "", toObjectErr(err, minioMetaMultipartBucket, path.Join(bucket, object))
+	// Validate if there are other incomplete upload-id's present for
+	// the object, if yes do not attempt to delete 'uploads.json'.
+	uploadsJSON, err := readUploadsJSON(bucket, object, fs.storage)
+	if err != nil {
+		return "", toObjectErr(err, minioMetaBucket, object)
+	}
+	// If we have successfully read `uploads.json`, then we proceed to
+	// purge or update `uploads.json`.
+	uploadIDIdx := uploadsJSON.Index(uploadID)
+	if uploadIDIdx != -1 {
+		uploadsJSON.Uploads = append(uploadsJSON.Uploads[:uploadIDIdx], uploadsJSON.Uploads[uploadIDIdx+1:]...)
+	}
+	if len(uploadsJSON.Uploads) > 0 {
+		if err = fs.updateUploadsJSON(bucket, object, uploadsJSON); err != nil {
+			return "", toObjectErr(err, minioMetaBucket, path.Join(mpartMetaPrefix, bucket, object))
+		}
+		// Return success.
+		return s3MD5, nil
+	}
+
+	if err = fs.storage.DeleteFile(minioMetaBucket, path.Join(mpartMetaPrefix, bucket, object, uploadsJSONFile)); err != nil {
+		return "", toObjectErr(err, minioMetaBucket, path.Join(mpartMetaPrefix, bucket, object))
 	}

 	// Return md5sum.
@@ -702,20 +795,36 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload

 // abortMultipartUpload - wrapper for purging an ongoing multipart
 // transaction, deletes uploadID entry from `uploads.json` and purges
-// the directory at '.minio.sys/multipart/bucket/object/uploadID' holding
+// the directory at '.minio/multipart/bucket/object/uploadID' holding
 // all the upload parts.
 func (fs fsObjects) abortMultipartUpload(bucket, object, uploadID string) error {
 	// Cleanup all uploaded parts.
 	if err := cleanupUploadedParts(bucket, object, uploadID, fs.storage); err != nil {
 		return err
 	}
-	fs.bgAppend.abort(uploadID)
-	// remove entry from uploads.json with quorum
-	if err := fs.removeUploadID(bucket, object, uploadID); err != nil {
-		return toObjectErr(err, bucket, object)
-	}

-	// success
+	// Validate if there are other incomplete upload-id's present for
+	// the object, if yes do not attempt to delete 'uploads.json'.
+	uploadsJSON, err := readUploadsJSON(bucket, object, fs.storage)
+	if err == nil {
+		uploadIDIdx := uploadsJSON.Index(uploadID)
+		if uploadIDIdx != -1 {
+			uploadsJSON.Uploads = append(uploadsJSON.Uploads[:uploadIDIdx], uploadsJSON.Uploads[uploadIDIdx+1:]...)
+		}
+		// There are pending uploads for the same object, preserve
+		// them update 'uploads.json' in-place.
+		if len(uploadsJSON.Uploads) > 0 {
+			err = fs.updateUploadsJSON(bucket, object, uploadsJSON)
+			if err != nil {
+				return toObjectErr(err, bucket, object)
+			}
+			return nil
+		}
+	} // No more pending uploads for the object, we purge the entire
+	// entry at '.minio/multipart/bucket/object'.
+	if err = fs.storage.DeleteFile(minioMetaBucket, path.Join(mpartMetaPrefix, bucket, object, uploadsJSONFile)); err != nil {
+		return toObjectErr(err, minioMetaBucket, path.Join(mpartMetaPrefix, bucket, object))
+	}
 	return nil
 }

@@ -734,26 +843,28 @@ func (fs fsObjects) abortMultipartUpload(bucket, object, uploadID string) error
 func (fs fsObjects) AbortMultipartUpload(bucket, object, uploadID string) error {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return traceError(BucketNameInvalid{Bucket: bucket})
+		return BucketNameInvalid{Bucket: bucket}
 	}
 	if !fs.isBucketExist(bucket) {
-		return traceError(BucketNotFound{Bucket: bucket})
+		return BucketNotFound{Bucket: bucket}
 	}
 	if !IsValidObjectName(object) {
-		return traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
+		return ObjectNameInvalid{Bucket: bucket, Object: object}
 	}

-	// Hold lock so that there is no competing
-	// complete-multipart-upload or put-object-part.
-	uploadIDLock := nsMutex.NewNSLock(minioMetaMultipartBucket,
-		pathJoin(bucket, object, uploadID))
-	uploadIDLock.Lock()
-	defer uploadIDLock.Unlock()
+	// Hold lock so that there is no competing complete-multipart-upload or put-object-part.
+	nsMutex.Lock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object, uploadID))
+	defer nsMutex.Unlock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object, uploadID))

 	if !fs.isUploadIDExists(bucket, object, uploadID) {
-		return traceError(InvalidUploadID{UploadID: uploadID})
+		return InvalidUploadID{UploadID: uploadID}
 	}

+	fsAppendMetaPath := getFSAppendMetaPath(uploadID)
+	// Lock fs-append.json so that no parallel appendParts() is being done.
+	nsMutex.Lock(minioMetaBucket, fsAppendMetaPath)
+	defer nsMutex.Unlock(minioMetaBucket, fsAppendMetaPath)
+
 	err := fs.abortMultipartUpload(bucket, object, uploadID)
 	return err
 }
@@ -1,212 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"bytes"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-)
-
-// TestNewMultipartUploadFaultyDisk - test NewMultipartUpload with faulty disks
-func TestNewMultipartUploadFaultyDisk(t *testing.T) {
-	// Prepare for tests
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-	obj := initFSObjects(disk, t)
-
-	fs := obj.(fsObjects)
-	bucketName := "bucket"
-	objectName := "object"
-
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Cannot create bucket, err: ", err)
-	}
-
-	// Test with faulty disk
-	fsStorage := fs.storage.(*retryStorage)
-	for i := 1; i <= 5; i++ {
-		// Faulty disk generates errFaultyDisk at 'i' storage api call number
-		fs.storage = newNaughtyDisk(fsStorage, map[int]error{i: errFaultyDisk}, nil)
-		if _, err := fs.NewMultipartUpload(bucketName, objectName, map[string]string{"X-Amz-Meta-xid": "3f"}); errorCause(err) != errFaultyDisk {
-			switch i {
-			case 1:
-				if !isSameType(errorCause(err), BucketNotFound{}) {
-					t.Fatal("Unexpected error ", err)
-				}
-			default:
-				t.Fatal("Unexpected error ", err)
-			}
-		}
-	}
-}
-
-// TestPutObjectPartFaultyDisk - test PutObjectPart with faulty disks
-func TestPutObjectPartFaultyDisk(t *testing.T) {
-	// Prepare for tests
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-	bucketName := "bucket"
-	objectName := "object"
-	data := []byte("12345")
-	dataLen := int64(len(data))
-
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Cannot create bucket, err: ", err)
-	}
-
-	uploadID, err := fs.NewMultipartUpload(bucketName, objectName, map[string]string{"X-Amz-Meta-xid": "3f"})
-	if err != nil {
-		t.Fatal("Unexpected error ", err)
-	}
-
-	md5Hex := getMD5Hash(data)
-	sha256sum := ""
-
-	// Test with faulty disk
-	fsStorage := fs.storage.(*retryStorage)
-	for i := 1; i <= 7; i++ {
-		// Faulty disk generates errFaultyDisk at 'i' storage api call number
-		fs.storage = newNaughtyDisk(fsStorage, map[int]error{i: errFaultyDisk}, nil)
-		md5sum, err := fs.PutObjectPart(bucketName, objectName, uploadID, 1, dataLen, bytes.NewReader(data), md5Hex, sha256sum)
-		if errorCause(err) != errFaultyDisk {
-			if errorCause(err) == nil {
-				t.Fatalf("Test %d shouldn't succeed, md5sum = %s\n", i, md5sum)
-			}
-			switch i {
-			case 1:
-				if !isSameType(errorCause(err), BucketNotFound{}) {
-					t.Fatal("Unexpected error ", err)
-				}
-			case 3:
-			case 2, 4, 5:
-				if !isSameType(errorCause(err), InvalidUploadID{}) {
-					t.Fatal("Unexpected error ", err)
-				}
-			default:
-				t.Fatal("Unexpected error ", i, err, reflect.TypeOf(errorCause(err)), reflect.TypeOf(errFaultyDisk))
-			}
-		}
-	}
-}
-
-// TestCompleteMultipartUploadFaultyDisk - test CompleteMultipartUpload with faulty disks
-func TestCompleteMultipartUploadFaultyDisk(t *testing.T) {
-	// Prepare for tests
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-	obj := initFSObjects(disk, t)
-
-	fs := obj.(fsObjects)
-	bucketName := "bucket"
-	objectName := "object"
-	data := []byte("12345")
-
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Cannot create bucket, err: ", err)
-	}
-
-	uploadID, err := fs.NewMultipartUpload(bucketName, objectName, map[string]string{"X-Amz-Meta-xid": "3f"})
-	if err != nil {
-		t.Fatal("Unexpected error ", err)
-	}
-
-	md5Hex := getMD5Hash(data)
-	sha256sum := ""
-
-	if _, err := fs.PutObjectPart(bucketName, objectName, uploadID, 1, 5, bytes.NewReader(data), md5Hex, sha256sum); err != nil {
-		t.Fatal("Unexpected error ", err)
-	}
-
-	parts := []completePart{{PartNumber: 1, ETag: md5Hex}}
-
-	fsStorage := fs.storage.(*retryStorage)
-	for i := 1; i <= 3; i++ {
-		// Faulty disk generates errFaultyDisk at 'i' storage api call number
-		fs.storage = newNaughtyDisk(fsStorage, map[int]error{i: errFaultyDisk}, nil)
-		if _, err := fs.CompleteMultipartUpload(bucketName, objectName, uploadID, parts); errorCause(err) != errFaultyDisk {
-			switch i {
-			case 1:
-				if !isSameType(errorCause(err), BucketNotFound{}) {
-					t.Fatal("Unexpected error ", err)
-				}
-			case 2:
-				if !isSameType(errorCause(err), InvalidUploadID{}) {
-					t.Fatal("Unexpected error ", err)
-				}
-			default:
-				t.Fatal("Unexpected error ", i, err, reflect.TypeOf(errorCause(err)), reflect.TypeOf(errFaultyDisk))
-			}
-		}
-	}
-}
-
-// TestListMultipartUploadsFaultyDisk - test ListMultipartUploads with faulty disks
-func TestListMultipartUploadsFaultyDisk(t *testing.T) {
-	// Prepare for tests
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-	bucketName := "bucket"
-	objectName := "object"
-	data := []byte("12345")
-
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Cannot create bucket, err: ", err)
-	}
-
-	uploadID, err := fs.NewMultipartUpload(bucketName, objectName, map[string]string{"X-Amz-Meta-xid": "3f"})
-	if err != nil {
-		t.Fatal("Unexpected error ", err)
-	}
-
-	md5Hex := getMD5Hash(data)
-	sha256sum := ""
-
-	if _, err := fs.PutObjectPart(bucketName, objectName, uploadID, 1, 5, bytes.NewReader(data), md5Hex, sha256sum); err != nil {
-		t.Fatal("Unexpected error ", err)
-	}
-
-	fsStorage := fs.storage.(*retryStorage)
-	for i := 1; i <= 4; i++ {
-		// Faulty disk generates errFaultyDisk at 'i' storage api call number
-		fs.storage = newNaughtyDisk(fsStorage, map[int]error{i: errFaultyDisk}, nil)
-		if _, err := fs.ListMultipartUploads(bucketName, objectName, "", "", "", 1000); errorCause(err) != errFaultyDisk {
-			switch i {
-			case 1:
-				if !isSameType(errorCause(err), BucketNotFound{}) {
-					t.Fatal("Unexpected error ", err)
-				}
-			case 2:
-				if !isSameType(errorCause(err), InvalidUploadID{}) {
-					t.Fatal("Unexpected error ", err)
-				}
-			case 3:
-				if errorCause(err) != errFileNotFound {
-					t.Fatal("Unexpected error ", err)
-				}
-			default:
-				t.Fatal("Unexpected error ", i, err, reflect.TypeOf(errorCause(err)), reflect.TypeOf(errFaultyDisk))
-			}
-		}
-	}
-}
@@ -18,55 +18,95 @@ package cmd

 import (
 	"crypto/md5"
-	"crypto/sha256"
 	"encoding/hex"
-	"errors"
-	"fmt"
-	"hash"
+	"encoding/json"
 	"io"
+	"os"
 	"path"
 	"sort"
 	"strings"
+	"sync"

+	"github.com/minio/minio/pkg/disk"
 	"github.com/minio/minio/pkg/mimedb"
 )

 // fsObjects - Implements fs object layer.
 type fsObjects struct {
-	storage StorageAPI
+	storage      StorageAPI
+	physicalDisk string

 	// List pool management.
 	listPool *treeWalkPool
-
-	// To manage the appendRoutine go0routines
-	bgAppend *backgroundAppend
 }

-// list of all errors that can be ignored in tree walk operation in FS
-var fsTreeWalkIgnoredErrs = []error{
-	errFileNotFound,
-	errVolumeNotFound,
+// creates format.json, the FS format info in minioMetaBucket.
+func initFormatFS(storageDisk StorageAPI) error {
+	return writeFSFormatData(storageDisk, newFSFormatV1())
+}
+
+// loads format.json from minioMetaBucket if it exists.
+func loadFormatFS(storageDisk StorageAPI) (format formatConfigV1, err error) {
+	// Reads entire `format.json`.
+	buf, err := storageDisk.ReadAll(minioMetaBucket, fsFormatJSONFile)
+	if err != nil {
+		return formatConfigV1{}, err
+	}
+
+	// Unmarshal format config.
+	if err = json.Unmarshal(buf, &format); err != nil {
+		return formatConfigV1{}, err
+	}
+
+	// Return structured `format.json`.
+	return format, nil
 }

 // newFSObjects - initialize new fs object layer.
-func newFSObjects(storage StorageAPI) (ObjectLayer, error) {
-	if storage == nil {
-		return nil, errInvalidArgument
+func newFSObjects(disk string) (ObjectLayer, error) {
+	storage, err := newStorageAPI(disk)
+	if err != nil && err != errDiskNotFound {
+		return nil, err
 	}

-	// Load format and validate.
-	_, err := loadFormatFS(storage)
+	// Attempt to create `.minio`.
+	err = storage.MakeVol(minioMetaBucket)
 	if err != nil {
-		return nil, fmt.Errorf("Unable to recognize backend format, %s", err)
+		switch err {
+		// Ignore the errors.
+		case errVolumeExists, errDiskNotFound, errFaultyDisk:
+		default:
+			return nil, toObjectErr(err, minioMetaBucket)
+		}
+	}
+
+	// Runs house keeping code, like creating minioMetaBucket, cleaning up tmp files etc.
+	if err = fsHouseKeeping(storage); err != nil {
+		return nil, err
+	}
+
+	// loading format.json from minioMetaBucket.
+	// Note: The format.json content is ignored, reserved for future use.
+	format, err := loadFormatFS(storage)
+	if err != nil {
+		if err == errFileNotFound {
+			// format.json doesn't exist, create it inside minioMetaBucket.
+			err = initFormatFS(storage)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
+	} else if !isFSFormat(format) {
+		return nil, errFSDiskFormat
 	}

 	// Initialize fs objects.
 	fs := fsObjects{
-		storage:  storage,
-		listPool: newTreeWalkPool(globalLookupTimeout),
-		bgAppend: &backgroundAppend{
-			infoMap: make(map[string]bgAppendPartsInfo),
-		},
+		storage:      storage,
+		physicalDisk: disk,
+		listPool:     newTreeWalkPool(globalLookupTimeout),
 	}

 	// Return successfully initialized object layer.
@@ -78,25 +118,25 @@ func (fs fsObjects) Shutdown() error {
 	// List if there are any multipart entries.
 	_, err := fs.storage.ListDir(minioMetaBucket, mpartMetaPrefix)
 	if err != errFileNotFound {
-		// A nil err means that multipart directory is not empty hence do not remove '.minio.sys' volume.
-		// A non nil err means that an unexpected error occurred
-		return toObjectErr(traceError(err))
+		// Multipart directory is not empty hence do not remove '.minio.sys' volume.
+		return nil
 	}
 	// List if there are any bucket configuration entries.
 	_, err = fs.storage.ListDir(minioMetaBucket, bucketConfigPrefix)
 	if err != errFileNotFound {
-		// A nil err means that bucket config directory is not empty hence do not remove '.minio.sys' volume.
-		// A non nil err means that an unexpected error occurred
-		return toObjectErr(traceError(err))
+		// Bucket config directory is not empty hence do not remove '.minio.sys' volume.
+		return nil
 	}
 	// Cleanup everything else.
 	prefix := ""
 	if err = cleanupDir(fs.storage, minioMetaBucket, prefix); err != nil {
+		errorIf(err, "Unable to cleanup minio meta bucket")
 		return err
 	}
 	if err = fs.storage.DeleteVol(minioMetaBucket); err != nil {
 		if err != errVolumeNotEmpty {
-			return toObjectErr(traceError(err))
+			errorIf(err, "Unable to delete minio meta bucket %s", minioMetaBucket)
+			return err
 		}
 	}
 	// Successful.
@@ -105,14 +145,12 @@ func (fs fsObjects) Shutdown() error {

 // StorageInfo - returns underlying storage statistics.
 func (fs fsObjects) StorageInfo() StorageInfo {
-	info, err := fs.storage.DiskInfo()
-	errorIf(err, "Unable to get disk info %#v", fs.storage)
-	storageInfo := StorageInfo{
+	info, err := disk.GetInfo(fs.physicalDisk)
+	fatalIf(err, "Unable to get disk info "+fs.physicalDisk)
+	return StorageInfo{
 		Total: info.Total,
 		Free:  info.Free,
 	}
-	storageInfo.Backend.Type = FS
-	return storageInfo
 }

 /// Bucket operations
@@ -121,10 +159,10 @@ func (fs fsObjects) StorageInfo() StorageInfo {
 func (fs fsObjects) MakeBucket(bucket string) error {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return traceError(BucketNameInvalid{Bucket: bucket})
+		return BucketNameInvalid{Bucket: bucket}
 	}
 	if err := fs.storage.MakeVol(bucket); err != nil {
-		return toObjectErr(traceError(err), bucket)
+		return toObjectErr(err, bucket)
 	}
 	return nil
 }
@@ -133,11 +171,11 @@ func (fs fsObjects) MakeBucket(bucket string) error {
 func (fs fsObjects) GetBucketInfo(bucket string) (BucketInfo, error) {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return BucketInfo{}, traceError(BucketNameInvalid{Bucket: bucket})
+		return BucketInfo{}, BucketNameInvalid{Bucket: bucket}
 	}
 	vi, err := fs.storage.StatVol(bucket)
 	if err != nil {
-		return BucketInfo{}, toObjectErr(traceError(err), bucket)
+		return BucketInfo{}, toObjectErr(err, bucket)
 	}
 	return BucketInfo{
 		Name:    bucket,
@@ -150,14 +188,12 @@ func (fs fsObjects) ListBuckets() ([]BucketInfo, error) {
 	var bucketInfos []BucketInfo
 	vols, err := fs.storage.ListVols()
 	if err != nil {
-		return nil, toObjectErr(traceError(err))
+		return nil, toObjectErr(err)
 	}
-	var invalidBucketNames []string
 	for _, vol := range vols {
 		// StorageAPI can send volume names which are incompatible
 		// with buckets, handle it and skip them.
 		if !IsValidBucketName(vol.Name) {
-			invalidBucketNames = append(invalidBucketNames, vol.Name)
 			continue
 		}
 		// Ignore the volume special bucket.
@@ -169,11 +205,6 @@ func (fs fsObjects) ListBuckets() ([]BucketInfo, error) {
 			Created: vol.Created,
 		})
 	}
-	// Print a user friendly message if we indeed skipped certain directories which are
-	// incompatible with S3's bucket name restrictions.
-	if len(invalidBucketNames) > 0 {
-		errorIf(errors.New("One or more invalid bucket names found"), "Skipping %s", invalidBucketNames)
-	}
 	sort.Sort(byBucketName(bucketInfos))
 	return bucketInfos, nil
 }
@@ -182,14 +213,14 @@ func (fs fsObjects) ListBuckets() ([]BucketInfo, error) {
 func (fs fsObjects) DeleteBucket(bucket string) error {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return traceError(BucketNameInvalid{Bucket: bucket})
+		return BucketNameInvalid{Bucket: bucket}
 	}
 	// Attempt to delete regular bucket.
 	if err := fs.storage.DeleteVol(bucket); err != nil {
-		return toObjectErr(traceError(err), bucket)
+		return toObjectErr(err, bucket)
 	}
 	// Cleanup all the previously incomplete multiparts.
-	if err := cleanupDir(fs.storage, minioMetaMultipartBucket, bucket); err != nil && errorCause(err) != errVolumeNotFound {
+	if err := cleanupDir(fs.storage, path.Join(minioMetaBucket, mpartMetaPrefix), bucket); err != nil && err != errVolumeNotFound {
 		return toObjectErr(err, bucket)
 	}
 	return nil
@@ -197,52 +228,57 @@ func (fs fsObjects) DeleteBucket(bucket string) error {

 /// Object Operations

+var getBufPool = sync.Pool{
+	New: func() interface{} {
+		b := make([]byte, readSizeV1)
+		return &b
+	},
+}
+
 // GetObject - get an object.
 func (fs fsObjects) GetObject(bucket, object string, offset int64, length int64, writer io.Writer) (err error) {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return traceError(BucketNameInvalid{Bucket: bucket})
+		return BucketNameInvalid{Bucket: bucket}
 	}
 	// Verify if object is valid.
 	if !IsValidObjectName(object) {
-		return traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
+		return ObjectNameInvalid{Bucket: bucket, Object: object}
 	}
 	// Offset and length cannot be negative.
 	if offset < 0 || length < 0 {
-		return toObjectErr(traceError(errUnexpected), bucket, object)
+		return toObjectErr(errUnexpected, bucket, object)
 	}
 	// Writer cannot be nil.
 	if writer == nil {
-		return toObjectErr(traceError(errUnexpected), bucket, object)
+		return toObjectErr(errUnexpected, bucket, object)
 	}

 	// Stat the file to get file size.
 	fi, err := fs.storage.StatFile(bucket, object)
 	if err != nil {
-		return toObjectErr(traceError(err), bucket, object)
+		return toObjectErr(err, bucket, object)
 	}

 	// Reply back invalid range if the input offset and length fall out of range.
 	if offset > fi.Size || length > fi.Size {
-		return traceError(InvalidRange{offset, length, fi.Size})
+		return InvalidRange{offset, length, fi.Size}
 	}
 	// Reply if we have inputs with offset and length falling out of file size range.
 	if offset+length > fi.Size {
-		return traceError(InvalidRange{offset, length, fi.Size})
+		return InvalidRange{offset, length, fi.Size}
 	}

-	// Lock the object before reading.
-	objectLock := nsMutex.NewNSLock(bucket, object)
-	objectLock.RLock()
-	defer objectLock.RUnlock()
-
 	var totalLeft = length
 	bufSize := int64(readSizeV1)
 	if length > 0 && bufSize > length {
 		bufSize = length
 	}
+
 	// Allocate a staging buffer.
-	buf := make([]byte, int(bufSize))
+	bufp := getBufPool.Get().(*[]byte)
+	buf := *bufp
+	defer getBufPool.Put(bufp)
 	for {
 		// Figure out the right size for the buffer.
 		curLeft := bufSize
@@ -262,11 +298,11 @@ func (fs fsObjects) GetObject(bucket, object string, offset int64, length int64,
 				offset += int64(nw)
 			}
 			if ew != nil {
-				err = traceError(ew)
+				err = ew
 				break
 			}
 			if nr != int64(nw) {
-				err = traceError(io.ErrShortWrite)
+				err = io.ErrShortWrite
 				break
 			}
 		}
@@ -274,7 +310,7 @@ func (fs fsObjects) GetObject(bucket, object string, offset int64, length int64,
 			break
 		}
 		if er != nil {
-			err = traceError(er)
+			err = er
 			break
 		}
 		if totalLeft == 0 {
@@ -285,15 +321,22 @@ func (fs fsObjects) GetObject(bucket, object string, offset int64, length int64,
 	return toObjectErr(err, bucket, object)
 }

-// getObjectInfo - get object info.
-func (fs fsObjects) getObjectInfo(bucket, object string) (ObjectInfo, error) {
+// GetObjectInfo - get object info.
+func (fs fsObjects) GetObjectInfo(bucket, object string) (ObjectInfo, error) {
+	// Verify if bucket is valid.
+	if !IsValidBucketName(bucket) {
+		return ObjectInfo{}, (BucketNameInvalid{Bucket: bucket})
+	}
+	// Verify if object is valid.
+	if !IsValidObjectName(object) {
+		return ObjectInfo{}, (ObjectNameInvalid{Bucket: bucket, Object: object})
+	}
 	fi, err := fs.storage.StatFile(bucket, object)
 	if err != nil {
-		return ObjectInfo{}, toObjectErr(traceError(err), bucket, object)
+		return ObjectInfo{}, toObjectErr(err, bucket, object)
 	}
 	fsMeta, err := readFSMetadata(fs.storage, minioMetaBucket, path.Join(bucketMetaPrefix, bucket, object, fsMetaJSONFile))
-	// Ignore error if the metadata file is not found, other errors must be returned.
-	if err != nil && errorCause(err) != errFileNotFound {
+	if err != nil && err != errFileNotFound {
 		return ObjectInfo{}, toObjectErr(err, bucket, object)
 	}

@@ -324,55 +367,41 @@ func (fs fsObjects) getObjectInfo(bucket, object string) (ObjectInfo, error) {
 	}, nil
 }

-// GetObjectInfo - get object info.
-func (fs fsObjects) GetObjectInfo(bucket, object string) (ObjectInfo, error) {
-	// Verify if bucket is valid.
-	if !IsValidBucketName(bucket) {
-		return ObjectInfo{}, traceError(BucketNameInvalid{Bucket: bucket})
-	}
-	// Verify if object is valid.
-	if !IsValidObjectName(object) {
-		return ObjectInfo{}, traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
-	}
-	return fs.getObjectInfo(bucket, object)
+var putBufPool = sync.Pool{
+	New: func() interface{} {
+		b := make([]byte, readSizeV1)
+		return &b
+	},
 }

-// PutObject - create an object.
-func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.Reader, metadata map[string]string, sha256sum string) (objInfo ObjectInfo, err error) {
+// PutObject - saves an object atomically of size - size bytes.
+// With size bytes of '-1' this function reads till EOF.
+func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.Reader, metadata map[string]string) (string, error) {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return ObjectInfo{}, traceError(BucketNameInvalid{Bucket: bucket})
+		return "", BucketNameInvalid{Bucket: bucket}
 	}
 	if !IsValidObjectName(object) {
-		return ObjectInfo{}, traceError(ObjectNameInvalid{
+		return "", ObjectNameInvalid{
 			Bucket: bucket,
 			Object: object,
-		})
+		}
 	}
 	// No metadata is set, allocate a new one.
 	if metadata == nil {
 		metadata = make(map[string]string)
 	}

-	uniqueID := mustGetUUID()
+	uniqueID := getUUID()

 	// Uploaded object will first be written to the temporary location which will eventually
 	// be renamed to the actual location. It is first written to the temporary location
 	// so that cleaning it up will be easy if the server goes down.
-	tempObj := uniqueID
+	tempObj := path.Join(tmpMetaPrefix, uniqueID)

 	// Initialize md5 writer.
 	md5Writer := md5.New()

-	hashWriters := []io.Writer{md5Writer}
-
-	var sha256Writer hash.Hash
-	if sha256sum != "" {
-		sha256Writer = sha256.New()
-		hashWriters = append(hashWriters, sha256Writer)
-	}
-	multiWriter := io.MultiWriter(hashWriters...)
-
 	// Limit the reader to its provided size if specified.
 	var limitDataReader io.Reader
 	if size > 0 {
@@ -385,47 +414,34 @@ func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.

 	if size == 0 {
 		// For size 0 we write a 0byte file.
-		err = fs.storage.AppendFile(minioMetaTmpBucket, tempObj, []byte(""))
+		err := fs.storage.AppendFile(minioMetaBucket, tempObj, []byte(""))
 		if err != nil {
-			fs.storage.DeleteFile(minioMetaTmpBucket, tempObj)
-			return ObjectInfo{}, toObjectErr(traceError(err), bucket, object)
+			return "", toObjectErr(err, bucket, object)
 		}
 	} else {
-
-		// Prepare file to avoid disk fragmentation
-		if size > 0 {
-			err = fs.storage.PrepareFile(minioMetaTmpBucket, tempObj, size)
-			if err != nil {
-				return ObjectInfo{}, toObjectErr(err, bucket, object)
-			}
-		}
-
 		// Allocate a buffer to Read() from request body
 		bufSize := int64(readSizeV1)
 		if size > 0 && bufSize > size {
 			bufSize = size
 		}
-		buf := make([]byte, int(bufSize))
-		teeReader := io.TeeReader(limitDataReader, multiWriter)
-		var bytesWritten int64
-		bytesWritten, err = fsCreateFile(fs.storage, teeReader, buf, minioMetaTmpBucket, tempObj)
+		bufp := putBufPool.Get().(*[]byte)
+		buf := *bufp
+		defer putBufPool.Put(bufp)
+
+		teeReader := io.TeeReader(limitDataReader, md5Writer)
+		bytesWritten, err := fsCreateFile(fs.storage, teeReader, buf[:bufSize], minioMetaBucket, tempObj)
 		if err != nil {
-			fs.storage.DeleteFile(minioMetaTmpBucket, tempObj)
-			errorIf(err, "Failed to create object %s/%s", bucket, object)
-			return ObjectInfo{}, toObjectErr(err, bucket, object)
+			fs.storage.DeleteFile(minioMetaBucket, tempObj)
+			return "", toObjectErr(err, bucket, object)
 		}

 		// Should return IncompleteBody{} error when reader has fewer
 		// bytes than specified in request header.
 		if bytesWritten < size {
-			fs.storage.DeleteFile(minioMetaTmpBucket, tempObj)
-			return ObjectInfo{}, traceError(IncompleteBody{})
+			fs.storage.DeleteFile(minioMetaBucket, tempObj)
+			return "", IncompleteBody{}
 		}
 	}
-	// Delete the temporary object in the case of a
-	// failure. If PutObject succeeds, then there would be
-	// nothing to delete.
-	defer fs.storage.DeleteFile(minioMetaTmpBucket, tempObj)

 	newMD5Hex := hex.EncodeToString(md5Writer.Sum(nil))
 	// Update the md5sum if not set with the newly calculated one.
@@ -433,48 +449,47 @@ func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.
 		metadata["md5Sum"] = newMD5Hex
 	}

+	// Validate if payload is valid.
+	if isSignVerify(data) {
+		if vErr := data.(*signVerifyReader).Verify(); vErr != nil {
+			// Incoming payload wrong, delete the temporary object.
+			fs.storage.DeleteFile(minioMetaBucket, tempObj)
+			// Error return.
+			return "", toObjectErr(vErr, bucket, object)
+		}
+	}
+
 	// md5Hex representation.
 	md5Hex := metadata["md5Sum"]
 	if md5Hex != "" {
 		if newMD5Hex != md5Hex {
+			// MD5 mismatch, delete the temporary object.
+			fs.storage.DeleteFile(minioMetaBucket, tempObj)
 			// Returns md5 mismatch.
-			return ObjectInfo{}, traceError(BadDigest{md5Hex, newMD5Hex})
+			return "", BadDigest{md5Hex, newMD5Hex}
 		}
 	}

-	if sha256sum != "" {
-		newSHA256sum := hex.EncodeToString(sha256Writer.Sum(nil))
-		if newSHA256sum != sha256sum {
-			return ObjectInfo{}, traceError(SHA256Mismatch{})
-		}
-	}
-
-	// Lock the object before committing the object.
-	objectLock := nsMutex.NewNSLock(bucket, object)
-	objectLock.RLock()
-	defer objectLock.RUnlock()
-
 	// Entire object was written to the temp location, now it's safe to rename it to the actual location.
-	err = fs.storage.RenameFile(minioMetaTmpBucket, tempObj, bucket, object)
+	err := fs.storage.RenameFile(minioMetaBucket, tempObj, bucket, object)
 	if err != nil {
-		return ObjectInfo{}, toObjectErr(traceError(err), bucket, object)
+		return "", toObjectErr(err, bucket, object)
 	}

-	// Save additional metadata. Initialize `fs.json` values.
-	fsMeta := newFSMetaV1()
-	fsMeta.Meta = metadata
+	// Save additional metadata only if extended headers such as "X-Amz-Meta-" are set.
+	if hasExtendedHeader(metadata) {
+		// Initialize `fs.json` values.
+		fsMeta := newFSMetaV1()
+		fsMeta.Meta = metadata

-	fsMetaPath := path.Join(bucketMetaPrefix, bucket, object, fsMetaJSONFile)
-	if err = writeFSMetadata(fs.storage, minioMetaBucket, fsMetaPath, fsMeta); err != nil {
-		return ObjectInfo{}, toObjectErr(traceError(err), bucket, object)
+		fsMetaPath := path.Join(bucketMetaPrefix, bucket, object, fsMetaJSONFile)
+		if err = writeFSMetadata(fs.storage, minioMetaBucket, fsMetaPath, fsMeta); err != nil {
+			return "", toObjectErr(err, bucket, object)
+		}
 	}

-	objInfo, err = fs.getObjectInfo(bucket, object)
-	if err == nil {
-		// If MINIO_ENABLE_FSMETA is not enabled objInfo.MD5Sum will be empty.
-		objInfo.MD5Sum = newMD5Hex
-	}
-	return objInfo, err
+	// Return md5sum, successfully wrote object.
+	return newMD5Hex, nil
 }

 // DeleteObject - deletes an object from a bucket, this operation is destructive
@@ -482,69 +497,86 @@ func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.
 func (fs fsObjects) DeleteObject(bucket, object string) error {
 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return traceError(BucketNameInvalid{Bucket: bucket})
+		return BucketNameInvalid{Bucket: bucket}
 	}
 	if !IsValidObjectName(object) {
-		return traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
+		return ObjectNameInvalid{Bucket: bucket, Object: object}
 	}
-
-	// Lock the object before deleting so that an in progress GetObject does not return
-	// corrupt data or there is no race with a PutObject.
-	objectLock := nsMutex.NewNSLock(bucket, object)
-	objectLock.RLock()
-	defer objectLock.RUnlock()
-
 	err := fs.storage.DeleteFile(minioMetaBucket, path.Join(bucketMetaPrefix, bucket, object, fsMetaJSONFile))
 	if err != nil && err != errFileNotFound {
-		return toObjectErr(traceError(err), bucket, object)
+		return toObjectErr(err, bucket, object)
 	}
 	if err = fs.storage.DeleteFile(bucket, object); err != nil {
-		return toObjectErr(traceError(err), bucket, object)
+		return toObjectErr(err, bucket, object)
 	}
 	return nil
 }

+// Checks whether bucket exists.
+func isBucketExist(storage StorageAPI, bucketName string) bool {
+	// Check whether bucket exists.
+	_, err := storage.StatVol(bucketName)
+	if err != nil {
+		if err == errVolumeNotFound {
+			return false
+		}
+		errorIf(err, "Stat failed on bucket "+bucketName+".")
+		return false
+	}
+	return true
+}
+
 // ListObjects - list all objects at prefix upto maxKeys., optionally delimited by '/'. Maintains the list pool
 // state for future re-entrant list requests.
 func (fs fsObjects) ListObjects(bucket, prefix, marker, delimiter string, maxKeys int) (ListObjectsInfo, error) {
-	// Convert entry to ObjectInfo
-	entryToObjectInfo := func(entry string) (objInfo ObjectInfo, err error) {
+	// Convert entry to FileInfo
+	entryToFileInfo := func(entry string) (fileInfo FileInfo, err error) {
 		if strings.HasSuffix(entry, slashSeparator) {
 			// Object name needs to be full path.
-			objInfo.Name = entry
-			objInfo.IsDir = true
+			fileInfo.Name = entry
+			fileInfo.Mode = os.ModeDir
 			return
 		}
-		if objInfo, err = fs.getObjectInfo(bucket, entry); err != nil {
-			return ObjectInfo{}, err
+		if fileInfo, err = fs.storage.StatFile(bucket, entry); err != nil {
+			return
 		}
+		fsMeta, mErr := readFSMetadata(fs.storage, minioMetaBucket, path.Join(bucketMetaPrefix, bucket, entry, fsMetaJSONFile))
+		if mErr != nil && mErr != errFileNotFound {
+			return FileInfo{}, mErr
+		}
+		if len(fsMeta.Meta) == 0 {
+			fsMeta.Meta = make(map[string]string)
+		}
+		// Object name needs to be full path.
+		fileInfo.Name = entry
+		fileInfo.MD5Sum = fsMeta.Meta["md5Sum"]
 		return
 	}

 	// Verify if bucket is valid.
 	if !IsValidBucketName(bucket) {
-		return ListObjectsInfo{}, traceError(BucketNameInvalid{Bucket: bucket})
+		return ListObjectsInfo{}, BucketNameInvalid{Bucket: bucket}
 	}
 	// Verify if bucket exists.
-	if !fs.isBucketExist(bucket) {
-		return ListObjectsInfo{}, traceError(BucketNotFound{Bucket: bucket})
+	if !isBucketExist(fs.storage, bucket) {
+		return ListObjectsInfo{}, BucketNotFound{Bucket: bucket}
 	}
 	if !IsValidObjectPrefix(prefix) {
-		return ListObjectsInfo{}, traceError(ObjectNameInvalid{Bucket: bucket, Object: prefix})
+		return ListObjectsInfo{}, ObjectNameInvalid{Bucket: bucket, Object: prefix}
 	}
 	// Verify if delimiter is anything other than '/', which we do not support.
 	if delimiter != "" && delimiter != slashSeparator {
-		return ListObjectsInfo{}, traceError(UnsupportedDelimiter{
+		return ListObjectsInfo{}, UnsupportedDelimiter{
 			Delimiter: delimiter,
-		})
+		}
 	}
 	// Verify if marker has prefix.
 	if marker != "" {
 		if !strings.HasPrefix(marker, prefix) {
-			return ListObjectsInfo{}, traceError(InvalidMarkerPrefixCombination{
+			return ListObjectsInfo{}, InvalidMarkerPrefixCombination{
 				Marker: marker,
 				Prefix: prefix,
-			})
+			}
 		}
 	}

@@ -583,10 +615,10 @@ func (fs fsObjects) ListObjects(bucket, prefix, marker, delimiter string, maxKey
 			// object string does not end with "/".
 			return !strings.HasSuffix(object, slashSeparator)
 		}
-		listDir := listDirFactory(isLeaf, fsTreeWalkIgnoredErrs, fs.storage)
+		listDir := listDirFactory(isLeaf, fs.storage)
 		walkResultCh = startTreeWalk(bucket, prefix, marker, recursive, listDir, isLeaf, endWalkCh)
 	}
-	var objInfos []ObjectInfo
+	var fileInfos []FileInfo
 	var eof bool
 	var nextMarker string
 	for i := 0; i < maxKeys; {
@@ -599,17 +631,17 @@ func (fs fsObjects) ListObjects(bucket, prefix, marker, delimiter string, maxKey
 		// For any walk error return right away.
 		if walkResult.err != nil {
 			// File not found is a valid case.
-			if errorCause(walkResult.err) == errFileNotFound {
+			if walkResult.err == errFileNotFound {
 				return ListObjectsInfo{}, nil
 			}
 			return ListObjectsInfo{}, toObjectErr(walkResult.err, bucket, prefix)
 		}
-		objInfo, err := entryToObjectInfo(walkResult.entry)
+		fileInfo, err := entryToFileInfo(walkResult.entry)
 		if err != nil {
 			return ListObjectsInfo{}, nil
 		}
-		nextMarker = objInfo.Name
-		objInfos = append(objInfos, objInfo)
+		nextMarker = fileInfo.Name
+		fileInfos = append(fileInfos, fileInfo)
 		if walkResult.end {
 			eof = true
 			break
@@ -622,28 +654,29 @@ func (fs fsObjects) ListObjects(bucket, prefix, marker, delimiter string, maxKey
 	}

 	result := ListObjectsInfo{IsTruncated: !eof}
-	for _, objInfo := range objInfos {
-		result.NextMarker = objInfo.Name
-		if objInfo.IsDir {
-			result.Prefixes = append(result.Prefixes, objInfo.Name)
+	for _, fileInfo := range fileInfos {
+		result.NextMarker = fileInfo.Name
+		if fileInfo.Mode.IsDir() {
+			result.Prefixes = append(result.Prefixes, fileInfo.Name)
 			continue
 		}
-		result.Objects = append(result.Objects, objInfo)
+		result.Objects = append(result.Objects, ObjectInfo{
+			Name:    fileInfo.Name,
+			ModTime: fileInfo.ModTime,
+			Size:    fileInfo.Size,
+			MD5Sum:  fileInfo.MD5Sum,
+			IsDir:   false,
+		})
 	}
 	return result, nil
 }

 // HealObject - no-op for fs. Valid only for XL.
 func (fs fsObjects) HealObject(bucket, object string) error {
-	return traceError(NotImplemented{})
+	return NotImplemented{}
 }

-// HealBucket - no-op for fs, Valid only for XL.
-func (fs fsObjects) HealBucket(bucket string) error {
-	return traceError(NotImplemented{})
-}
-
-// ListObjectsHeal - list all objects to be healed. Valid only for XL
+// HealListObjects - list objects for healing. Valid only for XL
 func (fs fsObjects) ListObjectsHeal(bucket, prefix, marker, delimiter string, maxKeys int) (ListObjectsInfo, error) {
-	return ListObjectsInfo{}, traceError(NotImplemented{})
+	return ListObjectsInfo{}, NotImplemented{}
 }
@@ -17,7 +17,6 @@
 package cmd

 import (
-	"bytes"
 	"os"
 	"path/filepath"
 	"testing"
@@ -40,313 +39,23 @@ func TestNewFS(t *testing.T) {
 		disks = append(disks, xlDisk)
 	}

-	endpoints, err := parseStorageEndpoints([]string{disk})
-	if err != nil {
-		t.Fatal("Uexpected error: ", err)
-	}
-
-	fsStorageDisks, err := initStorageDisks(endpoints)
-	if err != nil {
-		t.Fatal("Uexpected error: ", err)
-	}
-
-	endpoints, err = parseStorageEndpoints(disks)
-	if err != nil {
-		t.Fatal("Uexpected error: ", err)
-	}
-
-	xlStorageDisks, err := initStorageDisks(endpoints)
-	if err != nil {
-		t.Fatal("Uexpected error: ", err)
-	}
-
 	// Initializes all disks with XL
-	formattedDisks, err := waitForFormatDisks(true, endpoints, xlStorageDisks)
-	if err != nil {
-		t.Fatalf("Unable to format XL %s", err)
-	}
-	_, err = newXLObjects(formattedDisks)
+	_, err := newXLObjects(disks, nil)
 	if err != nil {
 		t.Fatalf("Unable to initialize XL object, %s", err)
 	}

 	testCases := []struct {
-		disk        StorageAPI
+		disk        string
 		expectedErr error
 	}{
-		{fsStorageDisks[0], nil},
-		{xlStorageDisks[0], errFSDiskFormat},
+		{disk, nil},
+		{disks[0], errFSDiskFormat},
 	}

 	for _, testCase := range testCases {
-		if _, err = waitForFormatDisks(true, endpoints, []StorageAPI{testCase.disk}); err != testCase.expectedErr {
-			t.Errorf("expected: %s, got :%s", testCase.expectedErr, err)
-		}
-	}
-	_, err = newFSObjects(nil)
-	if err != errInvalidArgument {
-		t.Errorf("Expecting error invalid argument, got %s", err)
-	}
-	_, err = newFSObjects(&retryStorage{xlStorageDisks[0]})
-	if err != nil {
-		errMsg := "Unable to recognize backend format, Disk is not in FS format."
-		if err.Error() == errMsg {
-			t.Errorf("Expecting %s, got %s", errMsg, err)
+		if _, err := newFSObjects(testCase.disk); err != testCase.expectedErr {
+			t.Fatalf("expected: %s, got: %s", testCase.expectedErr, err)
 		}
 	}
 }
-
-// TestFSShutdown - initialize a new FS object layer then calls
-// Shutdown to check returned results
-func TestFSShutdown(t *testing.T) {
-	rootPath, err := newTestConfig("us-east-1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer removeAll(rootPath)
-
-	bucketName := "testbucket"
-	objectName := "object"
-	// Create and return an fsObject with its path in the disk
-	prepareTest := func() (fsObjects, string) {
-		disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-		obj := initFSObjects(disk, t)
-		fs := obj.(fsObjects)
-		objectContent := "12345"
-		obj.MakeBucket(bucketName)
-		sha256sum := ""
-		obj.PutObject(bucketName, objectName, int64(len(objectContent)), bytes.NewReader([]byte(objectContent)), nil, sha256sum)
-		return fs, disk
-	}
-
-	// Test Shutdown with regular conditions
-	fs, disk := prepareTest()
-	if err := fs.Shutdown(); err != nil {
-		t.Fatal("Cannot shutdown the FS object: ", err)
-	}
-	removeAll(disk)
-
-	// FIXME: Check why Shutdown returns success when second posix call returns faulty disk error
-	// Test Shutdown with faulty disk
-	/* for i := 1; i <= 5; i++ {
-		fs, disk := prepareTest()
-		fs.DeleteObject(bucketName, objectName)
-		fsStorage := fs.storage.(*retryStorage)
-		fs.storage = newNaughtyDisk(fsStorage, map[int]error{i: errFaultyDisk}, nil)
-		if err := fs.Shutdown(); errorCause(err) != errFaultyDisk {
-			t.Fatal(i, ", Got unexpected fs shutdown error: ", err)
-		}
-		removeAll(disk)
-	} */
-}
-
-// TestFSLoadFormatFS - test loadFormatFS with healty and faulty disks
-func TestFSLoadFormatFS(t *testing.T) {
-	// Prepare for testing
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-
-	// Regular format loading
-	_, err := loadFormatFS(fs.storage)
-	if err != nil {
-		t.Fatal("Should not fail here", err)
-	}
-	// Loading corrupted format file
-	fs.storage.AppendFile(minioMetaBucket, fsFormatJSONFile, []byte{'b'})
-	_, err = loadFormatFS(fs.storage)
-	if err == nil {
-		t.Fatal("Should return an error here")
-	}
-	// Loading format file from faulty disk
-	fsStorage := fs.storage.(*retryStorage)
-	fs.storage = newNaughtyDisk(fsStorage, nil, errFaultyDisk)
-	_, err = loadFormatFS(fs.storage)
-	if err != errFaultyDisk {
-		t.Fatal("Should return faulty disk error")
-	}
-}
-
-// TestFSGetBucketInfo - test GetBucketInfo with healty and faulty disks
-func TestFSGetBucketInfo(t *testing.T) {
-	// Prepare for testing
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-	bucketName := "bucket"
-
-	obj.MakeBucket(bucketName)
-
-	// Test with valid parameters
-	info, err := fs.GetBucketInfo(bucketName)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if info.Name != bucketName {
-		t.Fatalf("wrong bucket name, expected: %s, found: %s", bucketName, info.Name)
-	}
-
-	// Test with inexistant bucket
-	_, err = fs.GetBucketInfo("a")
-	if !isSameType(errorCause(err), BucketNameInvalid{}) {
-		t.Fatal("BucketNameInvalid error not returned")
-	}
-
-	// Loading format file from faulty disk
-	fsStorage := fs.storage.(*retryStorage)
-	fs.storage = newNaughtyDisk(fsStorage, nil, errFaultyDisk)
-	_, err = fs.GetBucketInfo(bucketName)
-	if errorCause(err) != errFaultyDisk {
-		t.Fatal("errFaultyDisk error not returned")
-	}
-
-}
-
-// TestFSDeleteObject - test fs.DeleteObject() with healthy and corrupted disks
-func TestFSDeleteObject(t *testing.T) {
-	// Prepare for tests
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-	bucketName := "bucket"
-	objectName := "object"
-
-	obj.MakeBucket(bucketName)
-	sha256sum := ""
-	obj.PutObject(bucketName, objectName, int64(len("abcd")), bytes.NewReader([]byte("abcd")), nil, sha256sum)
-
-	// Test with invalid bucket name
-	if err := fs.DeleteObject("fo", objectName); !isSameType(errorCause(err), BucketNameInvalid{}) {
-		t.Fatal("Unexpected error: ", err)
-	}
-	// Test with invalid object name
-	if err := fs.DeleteObject(bucketName, "\\"); !isSameType(errorCause(err), ObjectNameInvalid{}) {
-		t.Fatal("Unexpected error: ", err)
-	}
-	// Test with inexist bucket/object
-	if err := fs.DeleteObject("foobucket", "fooobject"); !isSameType(errorCause(err), BucketNotFound{}) {
-		t.Fatal("Unexpected error: ", err)
-	}
-	// Test with valid condition
-	if err := fs.DeleteObject(bucketName, objectName); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	// Loading format file from faulty disk
-	fsStorage := fs.storage.(*retryStorage)
-	fs.storage = newNaughtyDisk(fsStorage, nil, errFaultyDisk)
-	if err := fs.DeleteObject(bucketName, objectName); errorCause(err) != errFaultyDisk {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-}
-
-// TestFSDeleteBucket - tests for fs DeleteBucket
-func TestFSDeleteBucket(t *testing.T) {
-	// Prepare for testing
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-	bucketName := "bucket"
-
-	err := obj.MakeBucket(bucketName)
-	if err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	// Test with an invalid bucket name
-	if err := fs.DeleteBucket("fo"); !isSameType(errorCause(err), BucketNameInvalid{}) {
-		t.Fatal("Unexpected error: ", err)
-	}
-	// Test with an inexistant bucket
-	if err := fs.DeleteBucket("foobucket"); !isSameType(errorCause(err), BucketNotFound{}) {
-		t.Fatal("Unexpected error: ", err)
-	}
-	// Test with a valid case
-	if err := fs.DeleteBucket(bucketName); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	obj.MakeBucket(bucketName)
-
-	// Loading format file from faulty disk
-	fsStorage := fs.storage.(*retryStorage)
-	for i := 1; i <= 2; i++ {
-		fs.storage = newNaughtyDisk(fsStorage, map[int]error{i: errFaultyDisk}, nil)
-		if err := fs.DeleteBucket(bucketName); errorCause(err) != errFaultyDisk {
-			t.Fatal("Unexpected error: ", err)
-		}
-	}
-
-}
-
-// TestFSListBuckets - tests for fs ListBuckets
-func TestFSListBuckets(t *testing.T) {
-	// Prepare for tests
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	fs := obj.(fsObjects)
-
-	bucketName := "bucket"
-	if err := obj.MakeBucket(bucketName); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	// Create a bucket with invalid name
-	if err := fs.storage.MakeVol("vo^"); err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-
-	// Test
-	buckets, err := fs.ListBuckets()
-	if err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-	if len(buckets) != 1 {
-		t.Fatal("ListBuckets not working properly")
-	}
-
-	// Test ListBuckets with faulty disks
-	fsStorage := fs.storage.(*retryStorage)
-	for i := 1; i <= 2; i++ {
-		fs.storage = newNaughtyDisk(fsStorage, nil, errFaultyDisk)
-		if _, err := fs.ListBuckets(); errorCause(err) != errFaultyDisk {
-			t.Fatal("Unexpected error: ", err)
-		}
-	}
-
-}
-
-// TestFSHealObject - tests for fs HealObject
-func TestFSHealObject(t *testing.T) {
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	err := obj.HealObject("bucket", "object")
-	if err == nil || !isSameType(errorCause(err), NotImplemented{}) {
-		t.Fatalf("Heal Object should return NotImplemented error ")
-	}
-}
-
-// TestFSListObjectHeal - tests for fs ListObjectHeals
-func TestFSListObjectsHeal(t *testing.T) {
-	disk := filepath.Join(os.TempDir(), "minio-"+nextSuffix())
-	defer removeAll(disk)
-
-	obj := initFSObjects(disk, t)
-	_, err := obj.ListObjectsHeal("bucket", "prefix", "marker", "delimiter", 1000)
-	if err == nil || !isSameType(errorCause(err), NotImplemented{}) {
-		t.Fatalf("Heal Object should return NotImplemented error ")
-	}
-}
@@ -23,7 +23,6 @@ import (
 	"strings"
 	"time"

-	humanize "github.com/dustin/go-humanize"
 	router "github.com/gorilla/mux"
 	"github.com/rs/cors"
 )
@@ -42,13 +41,9 @@ func registerHandlers(mux *router.Router, handlerFns ...HandlerFunc) http.Handle

 // Adds limiting body size middleware

-// Maximum allowed form data field values. 64MiB is a guessed practical value
-// which is more than enough to accommodate any form data fields and headers.
-const requestFormDataSize = 64 * humanize.MiByte
-
-// For any HTTP request, request body should be not more than 5GiB + requestFormDataSize
-// where, 5GiB is the maximum allowed object size for object upload.
-const requestMaxBodySize = 5*humanize.GiByte + requestFormDataSize
+// Set the body size limit to 6 Gb = Maximum object size + other possible data
+// in the same request
+const requestMaxBodySize = 1024 * 1024 * 1024 * (5 + 1)

 type requestSizeLimitHandler struct {
 	handler     http.Handler
@@ -83,20 +78,15 @@ func setBrowserRedirectHandler(h http.Handler) http.Handler {
 func (h redirectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Re-direction handled specifically for browsers.
 	if strings.Contains(r.Header.Get("User-Agent"), "Mozilla") && !isRequestSignatureV4(r) {
+		// '/' is redirected to 'locationPrefix/'
+		// '/webrpc' is redirected to 'locationPrefix/webrpc'
+		// '/login' is redirected to 'locationPrefix/login'
 		switch r.URL.Path {
 		case "/", "/webrpc", "/login", "/favicon.ico":
-			// '/' is redirected to 'locationPrefix/'
-			// '/webrpc' is redirected to 'locationPrefix/webrpc'
-			// '/login' is redirected to 'locationPrefix/login'
 			location := h.locationPrefix + r.URL.Path
 			// Redirect to new location.
 			http.Redirect(w, r, location, http.StatusTemporaryRedirect)
 			return
-		case h.locationPrefix:
-			// locationPrefix is redirected to 'locationPrefix/'
-			location := h.locationPrefix + "/"
-			http.Redirect(w, r, location, http.StatusTemporaryRedirect)
-			return
 		}
 	}
 	h.handler.ServeHTTP(w, r)
@@ -188,19 +178,18 @@ func parseAmzDateHeader(req *http.Request) (time.Time, APIErrorCode) {
 	return time.Time{}, ErrMissingDateHeader
 }

-type timeValidityHandler struct {
+type timeHandler struct {
 	handler http.Handler
 }

 // setTimeValidityHandler to validate parsable time over http header
 func setTimeValidityHandler(h http.Handler) http.Handler {
-	return timeValidityHandler{h}
+	return timeHandler{h}
 }

-func (h timeValidityHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	aType := getRequestAuthType(r)
-	if aType == authTypeSigned || aType == authTypeSignedV2 || aType == authTypeStreamingSigned {
-		// Verify if date headers are set, if not reject the request
+func (h timeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	// Verify if date headers are set, if not reject the request
+	if _, ok := r.Header["Authorization"]; ok {
 		amzDate, apiErr := parseAmzDateHeader(r)
 		if apiErr != ErrNone {
 			// All our internal APIs are sensitive towards Date
@@ -209,10 +198,10 @@ func (h timeValidityHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			writeErrorResponse(w, r, apiErr, r.URL.Path)
 			return
 		}
-		// Verify if the request date header is shifted by less than globalMaxSkewTime parameter in the past
+		// Verify if the request date header is shifted by less than maxSkewTime parameter in the past
 		// or in the future, reject request otherwise.
 		curTime := time.Now().UTC()
-		if curTime.Sub(amzDate) > globalMaxSkewTime || amzDate.Sub(curTime) > globalMaxSkewTime {
+		if curTime.Sub(amzDate) > maxSkewTime || amzDate.Sub(curTime) > maxSkewTime {
 			writeErrorResponse(w, r, ErrRequestTimeTooSkewed, r.URL.Path)
 			return
 		}
@@ -17,10 +17,8 @@
 package cmd

 import (
-	"crypto/x509"
 	"time"

-	humanize "github.com/dustin/go-humanize"
 	"github.com/fatih/color"
 	"github.com/minio/minio/pkg/objcache"
 )
@@ -32,61 +30,43 @@ const (

 // minio configuration related constants.
 const (
-	globalMinioConfigVersion      = "10"
-	globalMinioConfigDir          = ".minio"
-	globalMinioCertsDir           = "certs"
-	globalMinioCertsCADir         = "CAs"
-	globalMinioCertFile           = "public.crt"
-	globalMinioKeyFile            = "private.key"
-	globalMinioConfigFile         = "config.json"
-	globalMinioCertExpireWarnDays = time.Hour * 24 * 30 // 30 days.
+	globalMinioConfigVersion = "7"
+	globalMinioConfigDir     = ".minio"
+	globalMinioCertsDir      = "certs"
+	globalMinioCertFile      = "public.crt"
+	globalMinioKeyFile       = "private.key"
+	globalMinioConfigFile    = "config.json"
 	// Add new global values here.
 )

-const (
-	// Limit fields size (except file) to 1Mib since Policy document
-	// can reach that size according to https://aws.amazon.com/articles/1434
-	maxFormFieldSize = int64(1 * humanize.MiByte)
-
-	// The maximum allowed difference between the request generation time and the server processing time
-	globalMaxSkewTime = 15 * time.Minute
-)
-
 var (
-	globalQuiet    = false // Quiet flag set via command line.
-	globalIsDistXL = false // "Is Distributed?" flag.
-
+	globalQuiet = false // Quiet flag set via command line
+	globalTrace = false // Trace flag set via environment setting.
 	// Add new global flags here.

+	// Maximum connections handled per
+	// server, defaults to 0 (unlimited).
+	globalMaxConn = 0
 	// Maximum cache size.
 	globalMaxCacheSize = uint64(maxCacheSize)
 	// Cache expiry.
 	globalCacheExpiry = objcache.DefaultExpiry
-	// Minio local server address (in `host:port` format)
-	globalMinioAddr = ""
-	// Minio default port, can be changed through command line.
-	globalMinioPort = "9000"
-	// Holds the host that was passed using --address
-	globalMinioHost = ""
-	// Peer communication struct
-	globalS3Peers = s3Peers{}
-
-	// CA root certificates, a nil value means system certs pool will be used
-	globalRootCAs *x509.CertPool
-
 	// Add new variable global values here.
 )

 var (
-	// Keeps the connection active by waiting for following amount of time.
-	// Primarily used in ListenBucketNotification.
-	globalSNSConnAlive = 5 * time.Second
+	// Limit fields size (except file) to 1Mib since Policy document
+	// can reach that size according to https://aws.amazon.com/articles/1434
+	maxFormFieldSize = int64(1024 * 1024)
+)
+
+var (
+	// The maximum allowed difference between the request generation time and the server processing time
+	maxSkewTime = 15 * time.Minute
 )

 // global colors.
 var (
-	colorRed   = color.New(color.FgRed).SprintFunc()
-	colorBold  = color.New(color.Bold).SprintFunc()
-	colorBlue  = color.New(color.FgBlue).SprintfFunc()
-	colorGreen = color.New(color.FgGreen).SprintfFunc()
+	colorBlue = color.New(color.FgBlue).SprintfFunc()
+	colorBold = color.New(color.Bold).SprintFunc()
 )
@@ -22,6 +22,7 @@ import (
 	"mime/multipart"
 	"net/http"
 	"strings"
+	"time"
 )

 // Validates location constraint in PutBucket request body.
@@ -32,28 +33,34 @@ func isValidLocationConstraint(r *http.Request) (s3Error APIErrorCode) {
 	// If the request has no body with content-length set to 0,
 	// we do not have to validate location constraint. Bucket will
 	// be created at default region.
-	locationConstraint := createBucketLocationConfiguration{}
-	err := xmlDecoder(r.Body, &locationConstraint, r.ContentLength)
-	if err == nil || err == io.EOF {
-		// Successfully decoded, proceed to verify the region.
-		// Once region has been obtained we proceed to verify it.
-		incomingRegion := locationConstraint.Location
-		if incomingRegion == "" {
-			// Location constraint is empty for region "us-east-1",
-			// in accordance with protocol.
-			incomingRegion = "us-east-1"
-		}
-		// Return errInvalidRegion if location constraint does not match
-		// with configured region.
-		s3Error = ErrNone
-		if serverRegion != incomingRegion {
-			s3Error = ErrInvalidRegion
-		}
-		return s3Error
+	if r.ContentLength == 0 {
+		return ErrNone
 	}
-	errorIf(err, "Unable to xml decode location constraint")
-	// Treat all other failures as XML parsing errors.
-	return ErrMalformedXML
+	locationConstraint := createBucketLocationConfiguration{}
+	if err := xmlDecoder(r.Body, &locationConstraint, r.ContentLength); err != nil {
+		if err == io.EOF && r.ContentLength == -1 {
+			// EOF is a valid condition here when ContentLength is -1.
+			return ErrNone
+		}
+		errorIf(err, "Unable to xml decode location constraint")
+		// Treat all other failures as XML parsing errors.
+		return ErrMalformedXML
+	} // Successfully decoded, proceed to verify the region.
+
+	// Once region has been obtained we proceed to verify it.
+	incomingRegion := locationConstraint.Location
+	if incomingRegion == "" {
+		// Location constraint is empty for region "us-east-1",
+		// in accordance with protocol.
+		incomingRegion = "us-east-1"
+	}
+	// Return errInvalidRegion if location constraint does not match
+	// with configured region.
+	s3Error = ErrNone
+	if serverRegion != incomingRegion {
+		s3Error = ErrInvalidRegion
+	}
+	return s3Error
 }

 // Supported headers that needs to be extracted.
@@ -114,7 +121,7 @@ func extractPostPolicyFormValues(reader *multipart.Reader) (filePart io.Reader,
 				}
 				formValues[canonicalFormName] = string(buffer)
 			} else {
-				filePart = part
+				filePart = io.LimitReader(part, maxObjectSize)
 				fileName = part.FileName()
 				// As described in S3 spec, we expect file to be the last form field
 				break
@@ -123,3 +130,16 @@ func extractPostPolicyFormValues(reader *multipart.Reader) (filePart io.Reader,
 	}
 	return filePart, fileName, formValues, nil
 }
+
+// Send whitespace character, once every 5secs, until CompleteMultipartUpload is done.
+// CompleteMultipartUpload method of the object layer indicates that it's done via doneCh
+func sendWhiteSpaceChars(w http.ResponseWriter, doneCh <-chan struct{}) {
+	for {
+		select {
+		case <-time.After(5 * time.Second):
+			w.Write([]byte(" "))
+		case <-doneCh:
+			return
+		}
+	}
+}
@@ -33,15 +33,6 @@ func TestIsValidLocationContraint(t *testing.T) {
 	}
 	defer removeAll(path)

-	// Test with corrupted XML
-	malformedReq := &http.Request{
-		Body:          ioutil.NopCloser(bytes.NewBuffer([]byte("<>"))),
-		ContentLength: int64(len("<>")),
-	}
-	if err := isValidLocationConstraint(malformedReq); err != ErrMalformedXML {
-		t.Fatal("Unexpected error: ", err)
-	}
-
 	// generates the input request with XML bucket configuration set to the request body.
 	createExpectedRequest := func(req *http.Request, location string) (*http.Request, error) {
 		createBucketConfig := createBucketLocationConfiguration{}
@@ -105,16 +96,6 @@ func TestExtractMetadataHeaders(t *testing.T) {
 			},
 			metadata: map[string]string{},
 		},
-		// Validate if there are no keys to extract.
-		{
-			header: http.Header{
-				"X-Amz-Meta-Appid":   []string{"amz-meta"},
-				"X-Minio-Meta-Appid": []string{"minio-meta"},
-			},
-			metadata: map[string]string{
-				"X-Amz-Meta-Appid":   "amz-meta",
-				"X-Minio-Meta-Appid": "minio-meta"},
-		},
 	}

 	// Validate if the extracting headers.
@@ -1,48 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"crypto/md5"
-	"crypto/sha256"
-	"encoding/base64"
-	"encoding/hex"
-)
-
-// getSHA256Hash returns SHA-256 hash of given data.
-func getSHA256Hash(data []byte) string {
-	hash := sha256.New()
-	hash.Write(data)
-	return hex.EncodeToString(hash.Sum(nil))
-}
-
-// getMD5Sum returns MD5 sum of given data.
-func getMD5Sum(data []byte) []byte {
-	hash := md5.New()
-	hash.Write(data)
-	return hash.Sum(nil)
-}
-
-// getMD5Hash returns MD5 hash of given data.
-func getMD5Hash(data []byte) string {
-	return hex.EncodeToString(getMD5Sum(data))
-}
-
-// getMD5HashBase64 returns MD5 hash in base64 encoding of given data.
-func getMD5HashBase64(data []byte) string {
-	return base64.StdEncoding.EncodeToString(getMD5Sum(data))
-}
@@ -0,0 +1,42 @@
+/*
+ * Minio Cloud Storage, (C) 2016 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+import (
+	"net"
+	"sort"
+)
+
+// byLastOctet implements sort.Interface used in sorting a list
+// of ip address by their last octet value.
+type byLastOctet []net.IP
+
+func (n byLastOctet) Len() int      { return len(n) }
+func (n byLastOctet) Swap(i, j int) { n[i], n[j] = n[j], n[i] }
+func (n byLastOctet) Less(i, j int) bool {
+	return []byte(n[i].To4())[3] < []byte(n[j].To4())[3]
+}
+
+// getIPsFromHosts - returns a reverse sorted list of ips based on the last octet value.
+func getIPsFromHosts(hosts []string) (ips []net.IP) {
+	for _, host := range hosts {
+		ips = append(ips, net.ParseIP(host))
+	}
+	// Reverse sort ips by their last octet.
+	sort.Sort(sort.Reverse(byLastOctet(ips)))
+	return ips
+}
@@ -0,0 +1,61 @@
+/*
+ * Minio Cloud Storage, (C) 2016 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+import "testing"
+
+// Tests sorted list generated from hosts to ip.
+func TestHostToIP(t *testing.T) {
+	// Collection of test cases to validate last octet sorting.
+	testCases := []struct {
+		hosts       []string
+		sortedHosts []string
+	}{
+		{
+			// List of ip addresses that need to be sorted.
+			[]string{
+				"129.95.30.40",
+				"5.24.69.2",
+				"19.20.203.5",
+				"1.2.3.4",
+				"127.0.0.1",
+				"19.20.21.22",
+				"5.220.100.50",
+			},
+			// Numerical sorting result based on the last octet.
+			[]string{
+				"5.220.100.50",
+				"129.95.30.40",
+				"19.20.21.22",
+				"19.20.203.5",
+				"1.2.3.4",
+				"5.24.69.2",
+				"127.0.0.1",
+			},
+		},
+	}
+
+	// Tests the correct sorting behavior of getIPsFromHosts.
+	for j, testCase := range testCases {
+		ips := getIPsFromHosts(testCase.hosts)
+		for i, ip := range ips {
+			if ip.String() != testCase.sortedHosts[i] {
+				t.Fatalf("Test %d expected to pass but failed. Wanted ip %s, but got %s", j+1, testCase.sortedHosts[i], ip.String())
+			}
+		}
+	}
+}
@@ -1,88 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"fmt"
-	"math"
-	"time"
-)
-
-// humanizedDuration container to capture humanized time.
-type humanizedDuration struct {
-	Days    int64 `json:"days,omitempty"`
-	Hours   int64 `json:"hours,omitempty"`
-	Minutes int64 `json:"minutes,omitempty"`
-	Seconds int64 `json:"seconds,omitempty"`
-}
-
-// StringShort() humanizes humanizedDuration to human readable short format.
-// This does not print at seconds.
-func (r humanizedDuration) StringShort() string {
-	if r.Days == 0 && r.Hours == 0 {
-		return fmt.Sprintf("%d minutes", r.Minutes)
-	}
-	if r.Days == 0 {
-		return fmt.Sprintf("%d hours %d minutes", r.Hours, r.Minutes)
-	}
-	return fmt.Sprintf("%d days %d hours %d minutes", r.Days, r.Hours, r.Minutes)
-}
-
-// String() humanizes humanizedDuration to human readable,
-func (r humanizedDuration) String() string {
-	if r.Days == 0 && r.Hours == 0 && r.Minutes == 0 {
-		return fmt.Sprintf("%d seconds", r.Seconds)
-	}
-	if r.Days == 0 && r.Hours == 0 {
-		return fmt.Sprintf("%d minutes %d seconds", r.Minutes, r.Seconds)
-	}
-	if r.Days == 0 {
-		return fmt.Sprintf("%d hours %d minutes %d seconds", r.Hours, r.Minutes, r.Seconds)
-	}
-	return fmt.Sprintf("%d days %d hours %d minutes %d seconds", r.Days, r.Hours, r.Minutes, r.Seconds)
-}
-
-// timeDurationToHumanizedDuration convert golang time.Duration to a custom more readable humanizedDuration.
-func timeDurationToHumanizedDuration(duration time.Duration) humanizedDuration {
-	r := humanizedDuration{}
-	if duration.Seconds() < 60.0 {
-		r.Seconds = int64(duration.Seconds())
-		return r
-	}
-	if duration.Minutes() < 60.0 {
-		remainingSeconds := math.Mod(duration.Seconds(), 60)
-		r.Seconds = int64(remainingSeconds)
-		r.Minutes = int64(duration.Minutes())
-		return r
-	}
-	if duration.Hours() < 24.0 {
-		remainingMinutes := math.Mod(duration.Minutes(), 60)
-		remainingSeconds := math.Mod(duration.Seconds(), 60)
-		r.Seconds = int64(remainingSeconds)
-		r.Minutes = int64(remainingMinutes)
-		r.Hours = int64(duration.Hours())
-		return r
-	}
-	remainingHours := math.Mod(duration.Hours(), 24)
-	remainingMinutes := math.Mod(duration.Minutes(), 60)
-	remainingSeconds := math.Mod(duration.Seconds(), 60)
-	r.Hours = int64(remainingHours)
-	r.Minutes = int64(remainingMinutes)
-	r.Seconds = int64(remainingSeconds)
-	r.Days = int64(duration.Hours() / 24)
-	return r
-}
@@ -1,76 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"strings"
-	"testing"
-	"time"
-)
-
-// Test humanized duration.
-func TestHumanizedDuration(t *testing.T) {
-	duration := time.Duration(90487000000000)
-	humanDuration := timeDurationToHumanizedDuration(duration)
-	if !strings.HasSuffix(humanDuration.String(), "seconds") {
-		t.Fatal("Stringer method for humanized duration should have seconds.", humanDuration.String())
-	}
-	if strings.HasSuffix(humanDuration.StringShort(), "seconds") {
-		t.Fatal("StringShorter method for humanized duration should not have seconds.", humanDuration.StringShort())
-	}
-
-	// Test humanized duration for seconds.
-	humanSecDuration := timeDurationToHumanizedDuration(time.Duration(5 * time.Second))
-	expectedHumanSecDuration := humanizedDuration{
-		Seconds: 5,
-	}
-	if humanSecDuration != expectedHumanSecDuration {
-		t.Fatalf("Expected %#v, got %#v incorrect conversion of duration to humanized form",
-			expectedHumanSecDuration, humanSecDuration)
-	}
-	if strings.HasSuffix(humanSecDuration.String(), "days") ||
-		strings.HasSuffix(humanSecDuration.String(), "hours") ||
-		strings.HasSuffix(humanSecDuration.String(), "minutes") {
-		t.Fatal("Stringer method for humanized duration should have only seconds.", humanSecDuration.String())
-	}
-
-	// Test humanized duration for minutes.
-	humanMinDuration := timeDurationToHumanizedDuration(10 * time.Minute)
-	expectedHumanMinDuration := humanizedDuration{
-		Minutes: 10,
-	}
-	if humanMinDuration != expectedHumanMinDuration {
-		t.Fatalf("Expected %#v, got %#v incorrect conversion of duration to humanized form",
-			expectedHumanMinDuration, humanMinDuration)
-	}
-	if strings.HasSuffix(humanMinDuration.String(), "hours") {
-		t.Fatal("Stringer method for humanized duration should have only minutes.", humanMinDuration.String())
-	}
-
-	// Test humanized duration for hours.
-	humanHourDuration := timeDurationToHumanizedDuration(10 * time.Hour)
-	expectedHumanHourDuration := humanizedDuration{
-		Hours: 10,
-	}
-	if humanHourDuration != expectedHumanHourDuration {
-		t.Fatalf("Expected %#v, got %#v incorrect conversion of duration to humanized form",
-			expectedHumanHourDuration, humanHourDuration)
-	}
-	if strings.HasSuffix(humanHourDuration.String(), "days") {
-		t.Fatal("Stringer method for humanized duration should have hours.", humanHourDuration.String())
-	}
-}
@@ -1,69 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"fmt"
-	"net"
-	"sort"
-)
-
-// byLastOctetValue implements sort.Interface used in sorting a list
-// of ip address by their last octet value.
-type byLastOctetValue []net.IP
-
-func (n byLastOctetValue) Len() int      { return len(n) }
-func (n byLastOctetValue) Swap(i, j int) { n[i], n[j] = n[j], n[i] }
-func (n byLastOctetValue) Less(i, j int) bool {
-	return []byte(n[i].To4())[3] < []byte(n[j].To4())[3]
-}
-
-// getInterfaceIPv4s is synonymous to net.InterfaceAddrs()
-// returns net.IP IPv4 only representation of the net.Addr.
-// Additionally the returned list is sorted by their last
-// octet value.
-//
-// [The logic to sort by last octet is implemented to
-// prefer CIDRs with higher octects, this in-turn skips the
-// localhost/loopback address to be not preferred as the
-// first ip on the list. Subsequently this list helps us print
-// a user friendly message with appropriate values].
-func getInterfaceIPv4s() ([]net.IP, error) {
-	addrs, err := net.InterfaceAddrs()
-	if err != nil {
-		return nil, fmt.Errorf("Unable to determine network interface address. %s", err)
-	}
-	// Go through each return network address and collate IPv4 addresses.
-	var nips []net.IP
-	for _, addr := range addrs {
-		if addr.Network() == "ip+net" {
-			var nip net.IP
-			// Attempt to parse the addr through CIDR.
-			nip, _, err = net.ParseCIDR(addr.String())
-			if err != nil {
-				return nil, fmt.Errorf("Unable to parse addrss %s, error %s", addr, err)
-			}
-			// Collect only IPv4 addrs.
-			if nip.To4() != nil {
-				nips = append(nips, nip)
-			}
-		}
-	}
-	// Sort the list of IPs by their last octet value.
-	sort.Sort(sort.Reverse(byLastOctetValue(nips)))
-	return nips, nil
-}
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

+// Package leaktest provides tools to detect leaked goroutines in tests.
+// To use it, call "defer leaktest.AfterTest(t)()" at the beginning of each
+// test that may use goroutines.
 package cmd

 import (
-	"runtime/debug"
+	"runtime"
 	"sort"
 	"strings"
 	"time"
@@ -47,14 +50,14 @@ func (initialSnapShot LeakDetect) CompareCurrentSnapshot() []string {
 	return stackDiff
 }

-// DetectLeak - Creates a snapshot of runtime stack and compares it with the initial stack snapshot.
+// DetectLeak - Creates a snapshot of runtiem stack and compares it with  the initial stack snapshot.
 func (initialSnapShot LeakDetect) DetectLeak(t TestErrHandler) {
 	if t.Failed() {
 		return
 	}
 	// Loop, waiting for goroutines to shut down.
 	// Wait up to 5 seconds, but finish as quickly as possible.
-	deadline := time.Now().UTC().Add(leakDetectDeadline * time.Second)
+	deadline := time.Now().Add(leakDetectDeadline * time.Second)
 	for {
 		// get sack snapshot of relevant go routines.
 		leaked := initialSnapShot.CompareCurrentSnapshot()
@@ -63,7 +66,7 @@ func (initialSnapShot LeakDetect) DetectLeak(t TestErrHandler) {
 			return
 		}
 		// wait a test again will deadline.
-		if time.Now().UTC().Before(deadline) {
+		if time.Now().Before(deadline) {
 			time.Sleep(leakDetectPauseTimeMs * time.Millisecond)
 			continue
 		}
@@ -75,7 +78,7 @@ func (initialSnapShot LeakDetect) DetectLeak(t TestErrHandler) {
 	}
 }

-// DetectTestLeak -  snapshots the currently running goroutines and returns a
+// DetectTestLeak -  snapshots the currently-running goroutines and returns a
 // function to be run at the end of tests to see whether any
 // goroutines leaked.
 // Usage: `defer DetectTestLeak(t)()` in beginning line of benchmarks or unit tests.
@@ -123,8 +126,9 @@ func isIgnoredStackFn(stack string) (ok bool) {
 // pickRelevantGoroutines returns all goroutines we care about for the purpose
 // of leak checking. It excludes testing or runtime ones.
 func pickRelevantGoroutines() (gs []string) {
-	// get runtime stack buffer.
-	buf := debug.Stack()
+	// make a large buffer to hold the runtime stack info.
+	buf := make([]byte, 2<<20)
+	buf = buf[:runtime.Stack(buf, true)]
 	// runtime stack of go routines will be listed with 2 blank spaces between each of them, so split on "\n\n" .
 	for _, g := range strings.Split(string(buf), "\n\n") {
 		// Again split on a new line, the first line of the second half contaisn the info about the go routine.
@@ -1,272 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cmd
-
-import (
-	"errors"
-	"fmt"
-	"time"
-)
-
-type statusType string
-
-const (
-	runningStatus statusType = "Running"
-	blockedStatus statusType = "Blocked"
-)
-
-type lockType string
-
-const (
-	debugRLockStr lockType = "RLock"
-	debugWLockStr lockType = "WLock"
-)
-
-// Struct containing information of status (ready/running/blocked) of an operation with given operation ID.
-type debugLockInfo struct {
-	// "RLock" or "WLock".
-	lType lockType
-	// Contains the trace of the function which invoked the lock, obtained from runtime.
-	lockSource string
-	// Status can be running/ready/blocked.
-	status statusType
-	// Time info of the since how long the status holds true.
-	since time.Time
-}
-
-// debugLockInfo - container for storing locking information for unique copy
-// (volume,path) pair. ref variable holds the reference count for locks held for.
-// `ref` values helps us understand the n locks held for given <volume, path> pair.
-// `running` value helps us understand the total successful locks held (not blocked)
-// for given <volume, path> pair and the operation is under execution. `blocked`
-// value helps us understand the total number of operations blocked waiting on
-// locks for given <volume,path> pair.
-type debugLockInfoPerVolumePath struct {
-	ref      int64                    // running + blocked operations.
-	running  int64                    // count of successful lock acquire and running operations.
-	blocked  int64                    // count of number of operations blocked waiting on lock.
-	lockInfo map[string]debugLockInfo // map of [opsID] debugLockInfo{operation, status, since} .
-}
-
-// returns an instance of debugLockInfo.
-// need to create this for every unique pair of {volume,path}.
-// total locks, number of calls blocked on locks, and number of successful locks held but not unlocked yet.
-func newDebugLockInfoPerVolumePath() *debugLockInfoPerVolumePath {
-	return &debugLockInfoPerVolumePath{
-		lockInfo: make(map[string]debugLockInfo),
-		ref:      0,
-		blocked:  0,
-		running:  0,
-	}
-}
-
-// LockInfoOriginNotFound - While changing the state of the lock info its important that the entry for
-// lock at a given origin exists, if not `LockInfoOriginNotFound` is returned.
-type LockInfoOriginNotFound struct {
-	volume     string
-	path       string
-	opsID      string
-	lockSource string
-}
-
-func (l LockInfoOriginNotFound) Error() string {
-	return fmt.Sprintf("No lock state stored for the lock origined at \"%s\", for <volume> %s, <path> %s, <opsID> %s",
-		l.lockSource, l.volume, l.path, l.opsID)
-}
-
-// LockInfoVolPathMissing - Error interface. Returned when the info the
-type LockInfoVolPathMissing struct {
-	volume string
-	path   string
-}
-
-func (l LockInfoVolPathMissing) Error() string {
-	return fmt.Sprintf("No entry in debug Lock Map for Volume: %s, path: %s", l.volume, l.path)
-}
-
-// LockInfoOpsIDNotFound - Returned when the lock state info exists, but the entry for
-// given operation ID doesn't exist.
-type LockInfoOpsIDNotFound struct {
-	volume string
-	path   string
-	opsID  string
-}
-
-func (l LockInfoOpsIDNotFound) Error() string {
-	return fmt.Sprintf("No entry in lock info for <Operation ID> %s, <volume> %s, <path> %s", l.opsID, l.volume, l.path)
-}
-
-// LockInfoStateNotBlocked - When an attempt to change the state of the lock form `blocked` to `running` is done,
-// its necessary that the state before the transsition is "blocked", otherwise LockInfoStateNotBlocked returned.
-type LockInfoStateNotBlocked struct {
-	volume string
-	path   string
-	opsID  string
-}
-
-func (l LockInfoStateNotBlocked) Error() string {
-	return fmt.Sprintf("Lock state should be \"Blocked\" for <volume> %s, <path> %s, <opsID> %s", l.volume, l.path, l.opsID)
-}
-
-var errLockNotInitialized = errors.New("Debug lockMap not initialized")
-
-// Initialize lock info volume path.
-func (n *nsLockMap) initLockInfoForVolumePath(param nsParam) {
-	n.debugLockMap[param] = newDebugLockInfoPerVolumePath()
-}
-
-// Change the state of the lock from Blocked to Running.
-func (n *nsLockMap) statusBlockedToRunning(param nsParam, lockSource, opsID string, readLock bool) error {
-	// This operation is not executed under the scope nsLockMap.mutex.Lock(), lock has to be explicitly held here.
-	n.lockMapMutex.Lock()
-	defer n.lockMapMutex.Unlock()
-	// new state info to be set for the lock.
-	newLockInfo := debugLockInfo{
-		lockSource: lockSource,
-		status:     runningStatus,
-		since:      time.Now().UTC(),
-	}
-
-	// Set lock type.
-	if readLock {
-		newLockInfo.lType = debugRLockStr
-	} else {
-		newLockInfo.lType = debugWLockStr
-	}
-
-	// Check whether the lock info entry for <volume, path> pair already exists and its not `nil`.
-	debugLockMap, ok := n.debugLockMap[param]
-	if !ok {
-		// The lock state info foe given <volume, path> pair should already exist.
-		// If not return `LockInfoVolPathMissing`.
-		return traceError(LockInfoVolPathMissing{param.volume, param.path})
-	}
-	//  ``debugLockMap`` entry containing lock info for `param <volume, path>` is `nil`.
-	if debugLockMap == nil {
-		return traceError(errLockNotInitialized)
-	}
-	lockInfo, ok := n.debugLockMap[param].lockInfo[opsID]
-	if !ok {
-		// The lock info entry for given `opsID` should already exist for given <volume, path> pair.
-		// If not return `LockInfoOpsIDNotFound`.
-		return traceError(LockInfoOpsIDNotFound{param.volume, param.path, opsID})
-	}
-	// The entry for the lock origined at `lockSource` should already exist. If not return `LockInfoOriginNotFound`.
-	if lockInfo.lockSource != lockSource {
-		return traceError(LockInfoOriginNotFound{param.volume, param.path, opsID, lockSource})
-	}
-	// Status of the lock should already be set to "Blocked". If not return `LockInfoStateNotBlocked`.
-	if lockInfo.status != blockedStatus {
-		return traceError(LockInfoStateNotBlocked{param.volume, param.path, opsID})
-	}
-	// All checks finished. Changing the status of the operation from blocked to running and updating the time.
-	n.debugLockMap[param].lockInfo[opsID] = newLockInfo
-
-	// After locking unblocks decrease the blocked counter.
-	n.blockedCounter--
-	// Increase the running counter.
-	n.runningLockCounter++
-	n.debugLockMap[param].blocked--
-	n.debugLockMap[param].running++
-	return nil
-}
-
-// Change the state of the lock from Ready to Blocked.
-func (n *nsLockMap) statusNoneToBlocked(param nsParam, lockSource, opsID string, readLock bool) error {
-	newLockInfo := debugLockInfo{
-		lockSource: lockSource,
-		status:     blockedStatus,
-		since:      time.Now().UTC(),
-	}
-	if readLock {
-		newLockInfo.lType = debugRLockStr
-	} else {
-		newLockInfo.lType = debugWLockStr
-	}
-
-	lockInfo, ok := n.debugLockMap[param]
-	if !ok {
-		// State info entry for the given <volume, pair> doesn't exist, initializing it.
-		n.initLockInfoForVolumePath(param)
-	}
-	if lockInfo == nil {
-		//  *lockInfo is nil, initialize here.
-		n.initLockInfoForVolumePath(param)
-	}
-
-	// lockInfo is a map[string]debugLockInfo, which holds map[OperationID]{status,time, origin} of the lock.
-	if n.debugLockMap[param].lockInfo == nil {
-		n.debugLockMap[param].lockInfo = make(map[string]debugLockInfo)
-	}
-	// The status of the operation with the given operation ID is marked blocked till its gets unblocked from the lock.
-	n.debugLockMap[param].lockInfo[opsID] = newLockInfo
-	// Increment the Global lock counter.
-	n.globalLockCounter++
-	// Increment the counter for number of blocked opertions, decrement it after the locking unblocks.
-	n.blockedCounter++
-	// increment the reference of the lock for the given <volume,path> pair.
-	n.debugLockMap[param].ref++
-	// increment the blocked counter for the given <volume, path> pair.
-	n.debugLockMap[param].blocked++
-	return nil
-}
-
-// deleteLockInfoEntry - Deletes the lock state information for given
-// <volume, path> pair. Called when nsLk.ref count is 0.
-func (n *nsLockMap) deleteLockInfoEntryForVolumePath(param nsParam) error {
-	// delete the lock info for the given operation.
-	if _, found := n.debugLockMap[param]; !found {
-		return traceError(LockInfoVolPathMissing{param.volume, param.path})
-	}
-	// Remove from the map if there are no more references for the given (volume,path) pair.
-	delete(n.debugLockMap, param)
-	return nil
-}
-
-// deleteLockInfoEntry - Deletes the entry for given opsID in the lock state information
-// of given <volume, path> pair. Called when the nsLk ref count for the given
-// <volume, path> pair is not 0.
-func (n *nsLockMap) deleteLockInfoEntryForOps(param nsParam, opsID string) error {
-	// delete the lock info for the given operation.
-	infoMap, found := n.debugLockMap[param]
-	if !found {
-		return traceError(LockInfoVolPathMissing{param.volume, param.path})
-	}
-	// The opertion finished holding the lock on the resource, remove
-	// the entry for the given operation with the operation ID.
-	_, foundInfo := infoMap.lockInfo[opsID]
-	if !foundInfo {
-		// Unlock request with invalid opertion ID not accepted.
-		return traceError(LockInfoOpsIDNotFound{param.volume, param.path, opsID})
-	}
-	// Decrease the global running and lock reference counter.
-	n.runningLockCounter--
-	n.globalLockCounter--
-	// Decrease the lock referee counter for the lock info for given <volume,path> pair.
-	// Decrease the running operation number. Its assumed that the operation is over
-	// once an attempt to release the lock is made.
-	infoMap.running--
-	// Decrease the total reference count of locks jeld on <volume,path> pair.
-	infoMap.ref--
-	delete(infoMap.lockInfo, opsID)
-	return nil
-}
-
-// Return randomly generated string ID
-func getOpsID() string {
-	return newRequestID()
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harshavardhana	048af5e5cd	Fix an urgent issue in OS X build for 10.12 sierra.	2016-10-24 13:34:01 -07:00
Harshavardhana	b367365daa	Fix dockerfile.	2016-10-21 18:46:33 -07:00
Minio Trusted	d1331ecc5c	Fix user-agent prefix to have docker instead of suffix.	2016-10-21 17:49:56 -07:00
Harshavardhana	774e9c8e3a	Block change to 1M from 128KiB and extensively use buffer pools. Following are the benefits of this change. ``` benchmark old allocs new allocs delta BenchmarkPutObjectPart5MbFS-4 46172 16383 -64.52% BenchmarkPutObjectPart10MbFS-4 36849 7223 -80.40% BenchmarkPutObjectPart25MbFS-4 31699 3865 -87.81% BenchmarkPutObjectPart50MbFS-4 27577 2481 -91.00% BenchmarkPutObjectVerySmallFS-4 57 56 -1.75% BenchmarkPutObject10KbFS-4 57 56 -1.75% BenchmarkPutObject100KbFS-4 57 56 -1.75% BenchmarkPutObject1MbFS-4 176 56 -68.18% BenchmarkPutObject5MbFS-4 720 90 -87.50% BenchmarkPutObject10MbFS-4 1400 124 -91.14% BenchmarkPutObject25MbFS-4 3440 261 -92.41% BenchmarkPutObject50MbFS-4 6841 466 -93.19% ```	2016-10-20 13:39:24 -07:00
Harshavardhana	614a8cf7ad	Sign V2 support.	2016-10-18 17:22:20 -07:00
Harshavardhana	e32e8d1922	Fix docker file.	2016-10-13 21:18:36 -07:00
Harshavardhana	8c59a41668	Checking updates should send a proper user-agent.	2016-10-13 20:52:09 -07:00
Harshavardhana	29a2ffef5d	Fix build issue.	2016-10-13 09:27:44 -07:00
Harshavardhana	c836c454cc	Fix README.md on release branch	2016-10-12 18:26:59 -07:00
Harshavardhana	0f7300058b	Fix docker file.	2016-10-12 18:19:13 -07:00
Harshavardhana	c5300ec279	update: Deprecate the usage of update=yes query param. (#2801 ) Fixes #2799	2016-10-12 18:10:52 -07:00
Kevin Qiu	3d8d12ba1b	Use Set instead of Add in the event that the request already contains the content-length (#2683 )	2016-10-12 18:10:52 -07:00