Hi Ralph, I have some issue with merge this code change into master. I think that is because we have multiple commits for one file so it is not good to patch to current master. (I did rebase from upstream/master also)
https://patch-diff.githubusercontent.com/raw/apache/incubator-eagle/pull/23 .patch For example HdfsAuditLogProcessorMain is modified multiple times, so it reports the following issue, when I do patch. error: patch failed: eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/ security/auditlog/HdfsAuditLogProcessorMain.java:27 error: eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/ security/auditlog/HdfsAuditLogProcessorMain.java: patch does not apply Do we have a good way to condense all the commits together and then generate the patch? Thanks Edward On 12/11/15, 17:41, "ASF GitHub Bot (JIRA)" <[email protected]> wrote: > > [ >https://issues.apache.org/jira/browse/EAGLE-14?page=com.atlassian.jira.plu >gin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15053932#comme >nt-15053932 ] > >ASF GitHub Bot commented on EAGLE-14: >------------------------------------- > >GitHub user yonzhang opened a pull request: > > https://github.com/apache/incubator-eagle/pull/23 > > EAGLE-14: Hdfs User command re-assembler > > recreated, reviewed and to be merged > >You can merge this pull request into a Git repository by running: > > $ git pull https://github.com/yonzhang/incubator-eagle master > >Alternatively you can review and apply these changes as the patch at: > > https://github.com/apache/incubator-eagle/pull/23.patch > >To close this pull request, make a commit to your master/trunk branch >with (at least) the following in the commit message: > > This closes #23 > >---- >commit c352884d89a015afc556947221fc0d6f922fbb75 >Author: yonzhang <[email protected]> >Date: 2015-11-24T21:14:19Z > > user command reassembler > >commit 4d5b1a062e5ad80c93c8f89aa85661e499b164fc >Author: yonzhang <[email protected]> >Date: 2015-11-24T21:14:39Z > > test case for user command reassembler > >commit e3ef8f7c4d89739e285660c01e783e88fb86df21 >Author: yonzhang <[email protected]> >Date: 2015-12-03T00:29:12Z > > user command reassembler > >commit ccc8d9cf78dc19a47a78b24537d8a14eeee320a7 >Author: U-CORP\yonzhang <[email protected]> >Date: 2015-12-05T01:11:07Z > > flexible hfds user command pattern from file and db > >commit cf0d294501353aeba2d239db230ae04e0c3a3859 >Author: yonzhang <[email protected]> >Date: 2015-11-24T21:14:19Z > > user command reassembler > >commit f2d87615772de85bfbcf8052ef6188d84589772c >Author: yonzhang <[email protected]> >Date: 2015-11-24T21:14:39Z > > test case for user command reassembler > >commit fc4740b831efe9ed3cee3745dd33824de92eef3e >Author: yonzhang <[email protected]> >Date: 2015-12-03T00:29:12Z > > user command reassembler > >commit d0946ec23948d5f5c054a8061bb914932e88c523 >Author: U-CORP\yonzhang <[email protected]> >Date: 2015-12-05T01:11:07Z > > flexible hfds user command pattern from file and db > >commit 9361b1ac56b6b6af3e07e9669bd18a813c4a804f >Author: U-CORP\yonzhang <[email protected]> >Date: 2015-12-08T01:11:47Z > > script for append > >commit bc56b2319b4c7985cc5a1b6fa948cf803a9454c7 >Author: U-CORP\yonzhang <[email protected]> >Date: 2015-12-08T01:38:20Z > > fix conflict > >commit c18758280ee6aaf569625e95eec862acb0cd26bf >Author: yonzhang <[email protected]> >Date: 2015-12-08T20:02:34Z > > clean hdfsusercommand code and use eagleserviceconnector > >commit 606b65705ea20ce1592a20df9a1f85758168efcb >Author: yonzhang <[email protected]> >Date: 2015-12-09T01:41:28Z > > test siddhi state persist and restore > >commit 8af0515160dc07b4a984d095ec4a34fb3c3c6083 >Author: yonzhang <[email protected]> >Date: 2015-12-12T00:51:16Z > > add test case for snapshot/restore > >commit 2b3acd32bafdaf5ef75a16e9f2d5f7b949dd27fd >Author: yonzhang <[email protected]> >Date: 2015-12-12T00:52:11Z > > add license header > >commit 02912b67df5736bf5256c9ab3d9a53a5cc7f234a >Author: yonzhang <[email protected]> >Date: 2015-11-24T21:14:19Z > > user command reassembler > >commit 0b732fef7fbc63b75117ee6c7b9c4c2cb62db585 >Author: yonzhang <[email protected]> >Date: 2015-11-24T21:14:39Z > > test case for user command reassembler > >commit 3f3bc916877c9c29a843b195347115dd95d6f80d >Author: yonzhang <[email protected]> >Date: 2015-11-24T21:14:19Z > > user command reassembler > >commit e337176a1a13c2f9309a1915189f4e1d16779c56 >Author: yonzhang <[email protected]> >Date: 2015-12-03T00:29:12Z > > user command reassembler > >commit df3c4b0b91c44b69a5b71936dcd3d9f163fe2e9f >Author: U-CORP\yonzhang <[email protected]> >Date: 2015-12-05T01:11:07Z > > flexible hfds user command pattern from file and db > >commit c2c1f94bf0dc9d6c035e8de342bc0f29738abbb8 >Author: yonzhang <[email protected]> >Date: 2015-11-24T21:14:39Z > > test case for user command reassembler > >commit 72a3e7e06a014458891827e9614138d18b79f5ae >Author: yonzhang <[email protected]> >Date: 2015-12-03T00:29:12Z > > user command reassembler > >commit fc959392c1a1d1222a1fe5d48a8059570474d2f2 >Author: U-CORP\yonzhang <[email protected]> >Date: 2015-12-08T01:11:47Z > > script for append > >commit 19031409fcce7f7a5d68bdb3c66f6d28b41d9267 >Author: yonzhang <[email protected]> >Date: 2015-12-08T20:02:34Z > > clean hdfsusercommand code and use eagleserviceconnector > >commit 9181554c551fc513de4d3ae64a4e6ca984c11213 >Author: yonzhang <[email protected]> >Date: 2015-12-09T01:41:28Z > > test siddhi state persist and restore > >commit 4f1a850560ad23cd13a6e760e4e785b7a95c1fa0 >Author: yonzhang <[email protected]> >Date: 2015-12-12T00:51:16Z > > add test case for snapshot/restore > >commit e9cd3c4f5b63af8d1d25fd3f3dad98427723b970 >Author: yonzhang <[email protected]> >Date: 2015-12-12T00:52:11Z > > add license header > >commit 03a560faefe4cd4455ad3fa5710070f62ac35b3e >Author: yonzhang <[email protected]> >Date: 2015-12-12T01:40:06Z > > rebase/merge > >---- > > >> Re-assemble high level hdfs commands for better policy >> ------------------------------------------------------ >> >> Key: EAGLE-14 >> URL: https://issues.apache.org/jira/browse/EAGLE-14 >> Project: Eagle >> Issue Type: Improvement >> Affects Versions: 0.3.0 >> Reporter: Edward Zhang >> Assignee: Edward Zhang >> Fix For: 0.3.0 >> >> Original Estimate: 240h >> Remaining Estimate: 240h >> >> User today can use Eagle to create policy against the finest >>granularity of hdfs command for example getFileInfo, list, delete etc., >>but that sometimes is not good for defining a policy against a user's >>native command. >> Hdfs client would interpret user's high level command into multiple >>fine commands and send those fine commands to Hdfs server which in turn >>are logged into namenode audit log. For example one copyToLocal >>high-level command probably involves multiple fine commands like rename, >>move, delete etc. >> Eagle should have a capability to re-assemble those command in >>real-time to let user define policy on those high-level commands. > > > >-- >This message was sent by Atlassian JIRA >(v6.3.4#6332)
