Skip to content

[ZEPPELIN-1190] Visit and switch notebook revisions - #1675

Closed
khalidhuseynov wants to merge 19 commits into
apache:masterfrom
khalidhuseynov:feat/switch-revisions
Closed

[ZEPPELIN-1190] Visit and switch notebook revisions#1675
khalidhuseynov wants to merge 19 commits into
apache:masterfrom
khalidhuseynov:feat/switch-revisions

Conversation

@khalidhuseynov

@khalidhuseynovkhalidhuseynov commented Nov 24, 2016

Copy link
Copy Markdown
Member

What is this PR for?

This is to enable switching between revisions and being able to set Head/current note to one of those revisions. Currently notes are editable when switching between them, next step after this PR would be make them non-editable during revision switches.

What type of PR is it?

Improvement | Feature

Todos

  • - routes and switching revisions
  • - set revision button and api
  • - test for setting revision

What is the Jira issue?

ZEPPELIN-1190

How should this be tested?

set config in conf/zeppelin-env.sh

export ZEPPELIN_NOTEBOOK_STORAGE="org.apache.zeppelin.notebook.repo.GitNotebookRepo"

and switch between notes in note action bar, as well as set certain revisions as shown below

Screenshots (if appropriate)

switch revisions

Questions:

  • Does the licenses files need update? no
  • Is there breaking changes for older versions? no
  • Does this needs documentation? no?

@khalidhuseynov
khalidhuseynovforce-pushed the feat/switch-revisions branch 2 times, most recently from d5963a0 to 68c5d97CompareDecember 2, 2016 10:11
@khalidhuseynovkhalidhuseynov changed the title [ZEPPELIN-1190] [WIP] Visit and switch notebook revisions[ZEPPELIN-1190] Visit and switch notebook revisionsDec 2, 2016
@khalidhuseynov

Copy link
Copy Markdown
MemberAuthor

this is ready for review. @Leemoonsoo let me know if you have any feedback regarding this one.

@Leemoonsoo

Copy link
Copy Markdown
Member

Tested and it works well. Great work @khalidhuseynov.

But when i visit revision, shouldn't it be immutable? i can still edit and run.

@khalidhuseynov

Copy link
Copy Markdown
MemberAuthor

@Leemoonsoo yes right currently it's editable and runnable, which is updated in PR description. Actually I want to add additional offline or report-offline mode and basically switch to that mode when viewing revisions. I think that's quite separate issue from this one and can be addressed right after this one, what do you think?

@Leemoonsoo

Copy link
Copy Markdown
Member

@khalidhuseynov sounds good.

Let's wait for CI becomes green. Other than that, Looks good to me.

@khalidhuseynov

Copy link
Copy Markdown
MemberAuthor

created issue under ZEPPELIN-1745 for second part

@khalidhuseynov
khalidhuseynovforce-pushed the feat/switch-revisions branch 3 times, most recently from 01ed7b1 to a47bc06CompareDecember 3, 2016 05:56
@khalidhuseynov

khalidhuseynov commented Dec 3, 2016

Copy link
Copy Markdown
MemberAuthor

not sure why only one profile keeps failing with all rest api tests

@khalidhuseynov
khalidhuseynovforce-pushed the feat/switch-revisions branch 4 times, most recently from cba7306 to 25ccf8fCompareDecember 5, 2016 02:44
@khalidhuseynov
khalidhuseynovforce-pushed the feat/switch-revisions branch 3 times, most recently from 6500bec to 506fea0CompareDecember 6, 2016 02:11
@khalidhuseynov

Copy link
Copy Markdown
MemberAuthor

rebased from master, and 6th profile keeps failing with Zeppelin shutting down because of no SPARK_HOME. So initially fails to untar spark package:

+mkdir -p .spark-dist
+cd .spark-dist
+[[ ! -f spark-1.4.1-bin-hadoop2.3.tgz ]]
+cp spark-1.4.1-bin-hadoop2.3.tgz ..
+cd ..
+tar zxf spark-1.4.1-bin-hadoop2.3.tgz
gzip: stdin: unexpected end of file
tar: Unexpected EOF in archive
tar: Unexpected EOF in archive
tar: Error is not recoverable: exiting now
+echo 'Unable to extract spark-1.4.1-bin-hadoop2.3.tgz'
Unable to extract spark-1.4.1-bin-hadoop2.3.tgz
+rm -rf spark-1.4.1-bin-hadoop2.3
+rm -f spark-1.4.1-bin-hadoop2.3.tgz
+set +xe

and then in tests:

02:22:06,298 INFO org.apache.zeppelin.rest.AbstractTestRestApi:181 - Test Zeppelin stared.
SPARK HOME detected null
02:22:06,302 INFO org.apache.zeppelin.rest.AbstractTestRestApi:298 - Terminating test Zeppelin...

which fails all rest api tests. obviously this is not related to this PR, although not sure why spark untar keeps failing in same profile. logs are here.

@khalidhuseynov
khalidhuseynovforce-pushed the feat/switch-revisions branch 4 times, most recently from 02c2a19 to ab7db29CompareDecember 12, 2016 06:58
only when enabled when in certain revision
@khalidhuseynov

Copy link
Copy Markdown
MemberAuthor

@Leemoonsoo CI is finally green, I think it's ready to go

@Leemoonsoo

Copy link
Copy Markdown
Member

LGTM and merge to master if there're no further discussions.
@khalidhuseynov Great work!

@khalidhuseynov
khalidhuseynov deleted the feat/switch-revisions branch December 15, 2016 03:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@khalidhuseynov@Leemoonsoo