From 995b98ad1f534f6770977c0c6900a90de9cabb7b Mon Sep 17 00:00:00 2001 From: Justin Loyola Date: Mon, 12 Dec 2016 11:32:03 -0800 Subject: [PATCH 1/3] Files issue writing zip files --- master/upload.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/master/upload.go b/master/upload.go index ee758094..79206035 100644 --- a/master/upload.go +++ b/master/upload.go @@ -134,14 +134,17 @@ func (s *UploadHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return } - dst, err := os.OpenFile(dstPath, os.O_CREATE|os.O_TRUNC, fs.FilePerm) + dst, err := os.OpenFile(dstPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fs.FilePerm) if err != nil { log.Println("Upload file open operation failed:", err) http.Error(w, fmt.Sprintf("Error writing uploaded file to disk: %s", err), http.StatusInternalServerError) return } defer dst.Close() - io.Copy(dst, src) + if _, err := io.Copy(dst, src); err != nil { + log.Println("Error writing to destination:", err) + http.Error(w, fmt.Sprintf("Error writing zip file: %s", err), http.StatusInternalServerError) + } switch typ { case fs.KindEngine: From 0e161a4d8d52277a3392da277a9324f96280e151 Mon Sep 17 00:00:00 2001 From: Justin Loyola Date: Mon, 12 Dec 2016 11:36:58 -0800 Subject: [PATCH 2/3] Update versions and release notes --- ReleaseNotes.md | 8 ++++++-- etc/docker/centos-standalone/Dockerfile | 2 +- etc/docker/hadoop/Dockerfile | 2 +- etc/docker/standalone/Dockerfile | 2 +- gui/package.json | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 3dbdd357..9a2d60ff 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -10,12 +10,16 @@ If you're an Open Source community member, you can contact H2O using one of the - Send an e-mail message directly to support@h2o.ai - Ask your question on the [H2O Community](https://community.h2o.ai/spaces/540/index.html) site (create an account if necessary) +## v1.1.6 Changes + +- [STEAM-623] Fixes a bug that was preventing uploads from working correctly. + ## v1.1.5 Changes - [STEAM-613] The ``./steam add engine`` command has been replaced with ``./steam upload engine``. - [STEAM-604] When adding clusters to Steam, node sizes are now only specified in GB. -- [STEAM-619] Adds a confirmation dialog on deletion of a cluster -- [STEAM-601] Optional ability to supply Python dependencies for Anaconda +- [STEAM-619] Adds a confirmation dialog on deletion of a cluster. +- [STEAM-601] Optional ability to supply Python dependencies for Anaconda. ## v1.1.4 Changes diff --git a/etc/docker/centos-standalone/Dockerfile b/etc/docker/centos-standalone/Dockerfile index 6facec27..85e27c60 100644 --- a/etc/docker/centos-standalone/Dockerfile +++ b/etc/docker/centos-standalone/Dockerfile @@ -1,6 +1,6 @@ FROM centos:6.8 -MAINTAINER H2O.ai version: 1.1.5 +MAINTAINER H2O.ai version: 1.1.6 WORKDIR /steam diff --git a/etc/docker/hadoop/Dockerfile b/etc/docker/hadoop/Dockerfile index 11cdfef0..09e77720 100644 --- a/etc/docker/hadoop/Dockerfile +++ b/etc/docker/hadoop/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER H2O.ai USER root -ENV STEAM_VERSION 1.1.5 +ENV STEAM_VERSION 1.1.6 ENV PATH /steam/steam-${STEAM_VERSION}-linux-amd64:$PATH ENV PATH $PATH:/usr/local/hadoop/bin diff --git a/etc/docker/standalone/Dockerfile b/etc/docker/standalone/Dockerfile index 39d6c3b0..f5311163 100644 --- a/etc/docker/standalone/Dockerfile +++ b/etc/docker/standalone/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:latest -MAINTAINER H2O.ai version: 1.1.5 +MAINTAINER H2O.ai version: 1.1.6 WORKDIR /steam diff --git a/gui/package.json b/gui/package.json index f3129fa1..8758e788 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,6 +1,6 @@ { "name": "steam", - "version": "1.1.5", + "version": "1.1.6", "description": "", "main": "src/main.tsx", "dependencies": { From a8bd4a26c45b4acd04bfcfb4a65f49921961a920 Mon Sep 17 00:00:00 2001 From: angela0xdata Date: Mon, 12 Dec 2016 11:40:21 -0800 Subject: [PATCH 3/3] updated version to 1.1.6 Updated the conf.py version to 1.1.6 for hotfix/release. --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 137ae216..eecc02c3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -63,7 +63,7 @@ # built documents. # # The short X.Y version. -version = "Steam 1.1.5" +version = "Steam 1.1.6" # This commented out code is how the version is displayed in H2O. #if os.path.exists("project_version"):