[ZEPPELIN-1426] User aware storage sync

khalidhuseynov · Leemoonsoo · commit 64190707f7ba · 2016-09-15T16:14:42.000-07:00
### What is this PR for? This is to make storage layer sync function aware of the user ### What type of PR is it? Improvement ### Todos * [x] - change function and test ### What is the Jira issue? [ZEPPELIN-1426](https://issues.apache.org/jira/browse/ZEPPELIN-1426) ### How should this be tested? corresponding storage layer tests should pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Khalid Huseynov <khalidhnv@gmail.com> Closes #1424 from khalidhuseynov/storage/sync-with-subject and squashes the following commits: 7cc8455 [Khalid Huseynov] propagate subject to sync()
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
@@ -476,7 +476,7 @@ public void reloadAllNotes(AuthenticationInfo subject) throws IOException {
     if (notebookRepo instanceof NotebookRepoSync) {
       NotebookRepoSync mainRepo = (NotebookRepoSync) notebookRepo;
       if (mainRepo.getRepoCount() > 1) {
-        mainRepo.sync();
+        mainRepo.sync(subject);
       }
     }
 
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
@@ -93,7 +93,8 @@ public NotebookRepoSync(ZeppelinConfiguration conf) {
     }
     if (getRepoCount() > 1) {
       try {
-        sync(0, 1);
+        AuthenticationInfo subject = new AuthenticationInfo("anonymous");
+        sync(0, 1, subject);
       } catch (IOException e) {
         LOG.warn("Failed to sync with secondary storage on start {}", e);
       }
@@ -175,12 +176,12 @@ public void remove(String noteId, AuthenticationInfo subject) throws IOException
    *
    * @throws IOException
    */
-  void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {
+  void sync(int sourceRepoIndex, int destRepoIndex, AuthenticationInfo subject) throws IOException {
     LOG.info("Sync started");
     NotebookRepo srcRepo = getRepo(sourceRepoIndex);
     NotebookRepo dstRepo = getRepo(destRepoIndex);
-    List <NoteInfo> srcNotes = srcRepo.list(null);
-    List <NoteInfo> dstNotes = dstRepo.list(null);
+    List <NoteInfo> srcNotes = srcRepo.list(subject);
+    List <NoteInfo> dstNotes = dstRepo.list(subject);
 
     Map<String, List<String>> noteIDs = notesCheckDiff(srcNotes, srcRepo, dstNotes, dstRepo);
     List<String> pushNoteIDs = noteIDs.get(pushKey);
@@ -192,7 +193,7 @@ void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {
       for (String id : pushNoteIDs) {
         LOG.info("ID : " + id);
       }
-      pushNotes(pushNoteIDs, srcRepo, dstRepo);
+      pushNotes(subject, pushNoteIDs, srcRepo, dstRepo);
     } else {
       LOG.info("Nothing to push");
     }
@@ -202,7 +203,7 @@ void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {
       for (String id : pullNoteIDs) {
         LOG.info("ID : " + id);
       }
-      pushNotes(pullNoteIDs, dstRepo, srcRepo);
+      pushNotes(subject, pullNoteIDs, dstRepo, srcRepo);
     } else {
       LOG.info("Nothing to pull");
     }
@@ -212,28 +213,29 @@ void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {
       for (String id : delDstNoteIDs) {
         LOG.info("ID : " + id);
       }
-      deleteNotes(delDstNoteIDs, dstRepo);
+      deleteNotes(subject, delDstNoteIDs, dstRepo);
     } else {
       LOG.info("Nothing to delete from dest");
     }
 
     LOG.info("Sync ended");
   }
 
-  public void sync() throws IOException {
-    sync(0, 1);
+  public void sync(AuthenticationInfo subject) throws IOException {
+    sync(0, 1, subject);
   }
 
-  private void pushNotes(List<String> ids, NotebookRepo localRepo,
+  private void pushNotes(AuthenticationInfo subject, List<String> ids, NotebookRepo localRepo,
       NotebookRepo remoteRepo) throws IOException {
     for (String id : ids) {
-      remoteRepo.save(localRepo.get(id, null), null);
+      remoteRepo.save(localRepo.get(id, subject), subject);
     }
   }
 
-  private void deleteNotes(List<String> ids, NotebookRepo repo) throws IOException {
+  private void deleteNotes(AuthenticationInfo subject, List<String> ids, NotebookRepo repo)
+      throws IOException {
     for (String id : ids) {
-      repo.remove(id, null);
+      repo.remove(id, subject);
     }
   }
 
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
@@ -185,7 +185,7 @@ public void testSyncUpdateMain() throws IOException {
     assertEquals(0, notebookRepoSync.get(1,
         notebookRepoSync.list(1, null).get(0).getId(), null).getParagraphs().size());
     /* apply sync */
-    notebookRepoSync.sync();
+    notebookRepoSync.sync(null);
     /* check whether added to second storage */
     assertEquals(1, notebookRepoSync.get(1,
     notebookRepoSync.list(1, null).get(0).getId(), null).getParagraphs().size());

Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ public void reloadAllNotes(AuthenticationInfo subject) throws IOException {`
`476`	`476`	`if (notebookRepo instanceof NotebookRepoSync) {`
`477`	`477`	`NotebookRepoSync mainRepo = (NotebookRepoSync) notebookRepo;`
`478`	`478`	`if (mainRepo.getRepoCount() > 1) {`
`479`		`- mainRepo.sync();`
	`479`	`+ mainRepo.sync(subject);`
`480`	`480`	`}`
`481`	`481`	`}`
`482`	`482`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ public NotebookRepoSync(ZeppelinConfiguration conf) {`
`93`	`93`	`}`
`94`	`94`	`if (getRepoCount() > 1) {`
`95`	`95`	`try {`
`96`		`- sync(0, 1);`
	`96`	`+ AuthenticationInfo subject = new AuthenticationInfo("anonymous");`
	`97`	`+ sync(0, 1, subject);`
`97`	`98`	`} catch (IOException e) {`
`98`	`99`	`LOG.warn("Failed to sync with secondary storage on start {}", e);`
`99`	`100`	`}`
`@@ -175,12 +176,12 @@ public void remove(String noteId, AuthenticationInfo subject) throws IOException`
`175`	`176`	`*`
`176`	`177`	`* @throws IOException`
`177`	`178`	`*/`
`178`		`- void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {`
	`179`	`+ void sync(int sourceRepoIndex, int destRepoIndex, AuthenticationInfo subject) throws IOException {`
`179`	`180`	`LOG.info("Sync started");`
`180`	`181`	`NotebookRepo srcRepo = getRepo(sourceRepoIndex);`
`181`	`182`	`NotebookRepo dstRepo = getRepo(destRepoIndex);`
`182`		`- List <NoteInfo> srcNotes = srcRepo.list(null);`
`183`		`- List <NoteInfo> dstNotes = dstRepo.list(null);`
	`183`	`+ List <NoteInfo> srcNotes = srcRepo.list(subject);`
	`184`	`+ List <NoteInfo> dstNotes = dstRepo.list(subject);`
`184`	`185`
`185`	`186`	`Map<String, List<String>> noteIDs = notesCheckDiff(srcNotes, srcRepo, dstNotes, dstRepo);`
`186`	`187`	`List<String> pushNoteIDs = noteIDs.get(pushKey);`
`@@ -192,7 +193,7 @@ void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {`
`192`	`193`	`for (String id : pushNoteIDs) {`
`193`	`194`	`LOG.info("ID : " + id);`
`194`	`195`	`}`
`195`		`- pushNotes(pushNoteIDs, srcRepo, dstRepo);`
	`196`	`+ pushNotes(subject, pushNoteIDs, srcRepo, dstRepo);`
`196`	`197`	`} else {`
`197`	`198`	`LOG.info("Nothing to push");`
`198`	`199`	`}`
`@@ -202,7 +203,7 @@ void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {`
`202`	`203`	`for (String id : pullNoteIDs) {`
`203`	`204`	`LOG.info("ID : " + id);`
`204`	`205`	`}`
`205`		`- pushNotes(pullNoteIDs, dstRepo, srcRepo);`
	`206`	`+ pushNotes(subject, pullNoteIDs, dstRepo, srcRepo);`
`206`	`207`	`} else {`
`207`	`208`	`LOG.info("Nothing to pull");`
`208`	`209`	`}`
`@@ -212,28 +213,29 @@ void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {`
`212`	`213`	`for (String id : delDstNoteIDs) {`
`213`	`214`	`LOG.info("ID : " + id);`
`214`	`215`	`}`
`215`		`- deleteNotes(delDstNoteIDs, dstRepo);`
	`216`	`+ deleteNotes(subject, delDstNoteIDs, dstRepo);`
`216`	`217`	`} else {`
`217`	`218`	`LOG.info("Nothing to delete from dest");`
`218`	`219`	`}`
`219`	`220`
`220`	`221`	`LOG.info("Sync ended");`
`221`	`222`	`}`
`222`	`223`
`223`		`- public void sync() throws IOException {`
`224`		`- sync(0, 1);`
	`224`	`+ public void sync(AuthenticationInfo subject) throws IOException {`
	`225`	`+ sync(0, 1, subject);`
`225`	`226`	`}`
`226`	`227`
`227`		`- private void pushNotes(List<String> ids, NotebookRepo localRepo,`
	`228`	`+ private void pushNotes(AuthenticationInfo subject, List<String> ids, NotebookRepo localRepo,`
`228`	`229`	`NotebookRepo remoteRepo) throws IOException {`
`229`	`230`	`for (String id : ids) {`
`230`		`- remoteRepo.save(localRepo.get(id, null), null);`
	`231`	`+ remoteRepo.save(localRepo.get(id, subject), subject);`
`231`	`232`	`}`
`232`	`233`	`}`
`233`	`234`
`234`		`- private void deleteNotes(List<String> ids, NotebookRepo repo) throws IOException {`
	`235`	`+ private void deleteNotes(AuthenticationInfo subject, List<String> ids, NotebookRepo repo)`
	`236`	`+ throws IOException {`
`235`	`237`	`for (String id : ids) {`
`236`		`- repo.remove(id, null);`
	`238`	`+ repo.remove(id, subject);`
`237`	`239`	`}`
`238`	`240`	`}`
`239`	`241`