Skip to content

[ZEPPELIN-1033] HotFixing of paragraph deletion and re-ordering broken#1048

Closed
astroshim wants to merge 5 commits into
apache:masterfrom
astroshim:ZEPPELIN-1033
Closed

[ZEPPELIN-1033] HotFixing of paragraph deletion and re-ordering broken#1048
astroshim wants to merge 5 commits into
apache:masterfrom
astroshim:ZEPPELIN-1033

Conversation

@astroshim
Copy link
Copy Markdown
Contributor

@astroshim astroshim commented Jun 20, 2016

What is this PR for?

This PR is for fixing this issue

What type of PR is it?

Bug Fix

What is the Jira issue?

https://issues.apache.org/jira/browse/ZEPPELIN-1033

Questions:

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

@randerzander
Copy link
Copy Markdown
Contributor

randerzander commented Jun 20, 2016

@astroshim still getting same errors. After trying to "move up" and then "delete" a cell, I get these errors in the log: http://pastebin.com/Sr4WveXF

@astroshim
Copy link
Copy Markdown
Contributor Author

astroshim commented Jun 20, 2016

@randerzander Thank you for your review. Let me check.

@astroshim
Copy link
Copy Markdown
Contributor Author

astroshim commented Jun 20, 2016

@randerzander Did you build this PR?
You can get this PR from git clone https://github.com/astroshim/zeppelin -b ZEPPELIN-1033.
My zeppelin is working well as following screenshot.
test

Could you please check one more?

@AhyoungRyu
Copy link
Copy Markdown
Contributor

AhyoungRyu commented Jun 20, 2016

It works as before 👍

khalidhuseynov
khalidhuseynov reviewed Jun 20, 2016
View reviewed changes
Comment thread zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java Outdated
import org.apache.shiro.util.ThreadContext;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.config.Ini;
Copy link
Copy Markdown
Member

@khalidhuseynov khalidhuseynov Jun 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may need to remove import of Ini, doesn't seem to be used

Copy link
Copy Markdown
Contributor Author

@astroshim astroshim Jun 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your review. I removed importing Ini.

@khalidhuseynov
Copy link
Copy Markdown
Member

khalidhuseynov commented Jun 20, 2016

I checked it, and behavior with paragraph reordering fixed. So basically, previously shiro was initialized only when needed from shiro.ini, and now it's initialized always when starting the server explicitly. to be honest, i'm not exactly sure at the moment about the best way to solve the issue with SecurityManager initialization, since previously it was also initialized (automatically through the classpath) but wasn't available (possibly because of not injecting correctly). But definitely this one way to solve the issue at the moment, which can be further improved

@randerzander
Copy link
Copy Markdown
Contributor

randerzander commented Jun 21, 2016

I tried again from your branch and it worked. I must have applied your commit incorrectly last time.. my bad! Thanks for the fix =)

@astroshim
Copy link
Copy Markdown
Contributor Author

astroshim commented Jun 21, 2016

nice @randerzander thanks for addressing this issue and review.

This was referenced Jun 21, 2016
Closed
Closed
@Leemoonsoo
Copy link
Copy Markdown
Member

Leemoonsoo commented Jun 21, 2016

+1 for merge

@minahlee
Copy link
Copy Markdown
Member

minahlee commented Jun 21, 2016

Merging it as hotfix

@asfgit asfgit closed this in 286a888 Jun 21, 2016
asfgit pushed a commit that referenced this pull request Jun 21, 2016
@minahlee
[ZEPPELIN-1033] HotFixing of paragraph deletion and re-ordering broken
224e1d4 
### What is this PR for?
This PR is for fixing [this issue](https://issues.apache.org/jira/browse/ZEPPELIN-1033)

### What type of PR is it?
Bug Fix

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1033

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: astroshim <hsshim.nflabs.com>
Author: root <root@worker8.nflabs.com>

Closes #1048 from astroshim/ZEPPELIN-1033 and squashes the following commits:

eb80103 [astroshim] remove importing Ini and spaces
8eeb1bf [astroshim] update version of shiro config module.
5a2b268 [astroshim] add shiro ini to SecurityManager.
13a6139 [astroshim] add shiro-config-core
6c99111 [root] add initSecurityManager method.

(cherry picked from commit 286a888)
Signed-off-by: Mina Lee <minalee@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@astroshim @randerzander @AhyoungRyu @khalidhuseynov @Leemoonsoo @minahlee