You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@kudu.apache.org by "Grant Henke (Code Review)" <ge...@cloudera.org> on 2019/06/06 22:23:43 UTC

[kudu-CR] [backup] Fix backup CLI dependencies 

Grant Henke has uploaded this change for review. ( http://gerrit.cloudera.org:8080/13547


Change subject: [backup] Fix backup CLI dependencies
......................................................................

[backup] Fix backup CLI dependencies

This patch fixes the backup dependencies in two ways.

First, it fixes the Gradle handling of `isTool` to ensure
sl4j is included.

Second it breaks out the common
“library” type functionality into a kudu-backup-common
module so it can be shared between the kudu-back and
kudu-backup-tools module. This allows
kudu-backup-tools to shade slf4j and log4j without
affecting the kudu-backup dependencies.

I tested this by running a build and then running the
kudu-backup-tools localy via:
   `java -cp build/libs/kudu-backup-tools-1.10.0-SNAPSHOT.jar org.apache.kudu.backup.KuduBackupCLI`

The patch also sneaks in some interface annotations.

Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
---
M java/gradle/shadow.gradle
A java/kudu-backup-common/build.gradle
R java/kudu-backup-common/src/main/protobuf/backup.proto
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/BackupGraph.scala
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/BackupIO.scala
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/TableMetadata.scala
A java/kudu-backup-common/src/test/resources/log4j2.properties
R java/kudu-backup-common/src/test/scala/org/apache/kudu/backup/TestBackupGraph.scala
M java/kudu-backup-tools/build.gradle
A java/kudu-backup-tools/src/main/resources/log4j2.properties
M java/kudu-backup-tools/src/main/scala/org/apache/kudu/backup/KuduBackupCLI.scala
M java/kudu-backup-tools/src/main/scala/org/apache/kudu/backup/KuduBackupCleaner.scala
M java/kudu-backup/build.gradle
M java/settings.gradle
14 files changed, 163 insertions(+), 42 deletions(-)



  git pull ssh://gerrit.cloudera.org:29418/kudu refs/changes/47/13547/1
-- 
To view, visit http://gerrit.cloudera.org:8080/13547
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Gerrit-Change-Number: 13547
Gerrit-PatchSet: 1
Gerrit-Owner: Grant Henke <gr...@apache.org>

[kudu-CR] [backup] Fix backup CLI dependencies

Posted by "Grant Henke (Code Review)" <ge...@cloudera.org>.
Grant Henke has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/13547 )

Change subject: [backup] Fix backup CLI dependencies
......................................................................

[backup] Fix backup CLI dependencies

This patch fixes the backup dependencies in two ways.

First, it fixes the Gradle handling of `isTool` to ensure
sl4j is included.

Second it breaks out the common
“library” type functionality into a kudu-backup-common
module so it can be shared between the kudu-back and
kudu-backup-tools module. This allows
kudu-backup-tools to shade slf4j and log4j without
affecting the kudu-backup dependencies.

I tested this by running a build and then running the
kudu-backup-tools localy via:
   `java -cp build/libs/kudu-backup-tools-1.10.0-SNAPSHOT.jar org.apache.kudu.backup.KuduBackupCLI`

The patch also sneaks in some interface annotations.

Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Reviewed-on: http://gerrit.cloudera.org:8080/13547
Tested-by: Grant Henke <gr...@apache.org>
Reviewed-by: Mike Percy <mp...@apache.org>
---
M java/gradle/shadow.gradle
A java/kudu-backup-common/build.gradle
R java/kudu-backup-common/src/main/protobuf/backup.proto
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/BackupGraph.scala
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/BackupIO.scala
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/TableMetadata.scala
A java/kudu-backup-common/src/test/resources/log4j2.properties
R java/kudu-backup-common/src/test/scala/org/apache/kudu/backup/TestBackupGraph.scala
M java/kudu-backup-tools/build.gradle
A java/kudu-backup-tools/src/main/resources/log4j2.properties
M java/kudu-backup-tools/src/main/scala/org/apache/kudu/backup/KuduBackupCLI.scala
M java/kudu-backup-tools/src/main/scala/org/apache/kudu/backup/KuduBackupCleaner.scala
M java/kudu-backup/build.gradle
M java/settings.gradle
14 files changed, 160 insertions(+), 37 deletions(-)

Approvals:
  Grant Henke: Verified
  Mike Percy: Looks good to me, approved

-- 
To view, visit http://gerrit.cloudera.org:8080/13547
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Gerrit-Change-Number: 13547
Gerrit-PatchSet: 3
Gerrit-Owner: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Kudu Jenkins (120)
Gerrit-Reviewer: Mike Percy <mp...@apache.org>

[kudu-CR] [backup] Fix backup CLI dependencies

Posted by "Mike Percy (Code Review)" <ge...@cloudera.org>.
Mike Percy has posted comments on this change. ( http://gerrit.cloudera.org:8080/13547 )

Change subject: [backup] Fix backup CLI dependencies
......................................................................


Patch Set 1: Code-Review+1

(2 comments)

Thanks for doing this!

http://gerrit.cloudera.org:8080/#/c/13547/1/java/kudu-backup-tools/build.gradle
File java/kudu-backup-tools/build.gradle:

http://gerrit.cloudera.org:8080/#/c/13547/1/java/kudu-backup-tools/build.gradle@52
PS1, Line 52: 
Can we make this an executable JAR? Something to the effect of:

jar {
    manifest {
        attributes 'Main-Class': 'org.apache.kudu.backup.KuduBackupCLI'
    }
}


http://gerrit.cloudera.org:8080/#/c/13547/1/java/kudu-backup-tools/build.gradle@53
PS1, Line 53: // java -cp build/libs/kudu-backup-tools-1.10.0-SNAPSHOT.jar org.apache.kudu.backup.KuduBackupCLI --help
?



-- 
To view, visit http://gerrit.cloudera.org:8080/13547
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Gerrit-Change-Number: 13547
Gerrit-PatchSet: 1
Gerrit-Owner: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Kudu Jenkins (120)
Gerrit-Reviewer: Mike Percy <mp...@apache.org>
Gerrit-Comment-Date: Thu, 06 Jun 2019 22:38:04 +0000
Gerrit-HasComments: Yes

[kudu-CR] [backup] Fix backup CLI dependencies

Posted by "Mike Percy (Code Review)" <ge...@cloudera.org>.
Mike Percy has posted comments on this change. ( http://gerrit.cloudera.org:8080/13547 )

Change subject: [backup] Fix backup CLI dependencies
......................................................................


Patch Set 2: Code-Review+2


-- 
To view, visit http://gerrit.cloudera.org:8080/13547
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Gerrit-Change-Number: 13547
Gerrit-PatchSet: 2
Gerrit-Owner: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Kudu Jenkins (120)
Gerrit-Reviewer: Mike Percy <mp...@apache.org>
Gerrit-Comment-Date: Fri, 07 Jun 2019 19:01:15 +0000
Gerrit-HasComments: No

[kudu-CR] [backup] Fix backup CLI dependencies

Posted by "Mike Percy (Code Review)" <ge...@cloudera.org>.
Mike Percy has posted comments on this change. ( http://gerrit.cloudera.org:8080/13547 )

Change subject: [backup] Fix backup CLI dependencies
......................................................................


Patch Set 2:

(1 comment)

http://gerrit.cloudera.org:8080/#/c/13547/1/java/kudu-backup-tools/build.gradle
File java/kudu-backup-tools/build.gradle:

http://gerrit.cloudera.org:8080/#/c/13547/1/java/kudu-backup-tools/build.gradle@52
PS1, Line 52: 
> I will do that in a follow up patch. The way it's structured now there are 
ah, oops



-- 
To view, visit http://gerrit.cloudera.org:8080/13547
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Gerrit-Change-Number: 13547
Gerrit-PatchSet: 2
Gerrit-Owner: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Kudu Jenkins (120)
Gerrit-Reviewer: Mike Percy <mp...@apache.org>
Gerrit-Comment-Date: Fri, 07 Jun 2019 19:00:15 +0000
Gerrit-HasComments: Yes

[kudu-CR] [backup] Fix backup CLI dependencies

Posted by "Grant Henke (Code Review)" <ge...@cloudera.org>.
Grant Henke has posted comments on this change. ( http://gerrit.cloudera.org:8080/13547 )

Change subject: [backup] Fix backup CLI dependencies
......................................................................


Patch Set 2: Verified+1

(2 comments)

http://gerrit.cloudera.org:8080/#/c/13547/1/java/kudu-backup-tools/build.gradle
File java/kudu-backup-tools/build.gradle:

http://gerrit.cloudera.org:8080/#/c/13547/1/java/kudu-backup-tools/build.gradle@52
PS1, Line 52: 
> Can we make this an executable JAR? Something to the effect of:
I will do that in a follow up patch. The way it's structured now there are two CLIs. KuduBackupCLI and KuduBackupCleaner.


http://gerrit.cloudera.org:8080/#/c/13547/1/java/kudu-backup-tools/build.gradle@53
PS1, Line 53: 
> ?
oops.



-- 
To view, visit http://gerrit.cloudera.org:8080/13547
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Gerrit-Change-Number: 13547
Gerrit-PatchSet: 2
Gerrit-Owner: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Kudu Jenkins (120)
Gerrit-Reviewer: Mike Percy <mp...@apache.org>
Gerrit-Comment-Date: Fri, 07 Jun 2019 02:11:23 +0000
Gerrit-HasComments: Yes

[kudu-CR] [backup] Fix backup CLI dependencies

Posted by "Grant Henke (Code Review)" <ge...@cloudera.org>.
Grant Henke has removed a vote on this change.

Change subject: [backup] Fix backup CLI dependencies
......................................................................


Removed Verified-1 by Kudu Jenkins (120)
-- 
To view, visit http://gerrit.cloudera.org:8080/13547
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: deleteVote
Gerrit-Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Gerrit-Change-Number: 13547
Gerrit-PatchSet: 2
Gerrit-Owner: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Kudu Jenkins (120)
Gerrit-Reviewer: Mike Percy <mp...@apache.org>

[kudu-CR] [backup] Fix backup CLI dependencies

Posted by "Grant Henke (Code Review)" <ge...@cloudera.org>.
Hello Mike Percy, Kudu Jenkins, 

I'd like you to reexamine a change. Please visit

    http://gerrit.cloudera.org:8080/13547

to look at the new patch set (#2).

Change subject: [backup] Fix backup CLI dependencies
......................................................................

[backup] Fix backup CLI dependencies

This patch fixes the backup dependencies in two ways.

First, it fixes the Gradle handling of `isTool` to ensure
sl4j is included.

Second it breaks out the common
“library” type functionality into a kudu-backup-common
module so it can be shared between the kudu-back and
kudu-backup-tools module. This allows
kudu-backup-tools to shade slf4j and log4j without
affecting the kudu-backup dependencies.

I tested this by running a build and then running the
kudu-backup-tools localy via:
   `java -cp build/libs/kudu-backup-tools-1.10.0-SNAPSHOT.jar org.apache.kudu.backup.KuduBackupCLI`

The patch also sneaks in some interface annotations.

Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
---
M java/gradle/shadow.gradle
A java/kudu-backup-common/build.gradle
R java/kudu-backup-common/src/main/protobuf/backup.proto
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/BackupGraph.scala
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/BackupIO.scala
R java/kudu-backup-common/src/main/scala/org/apache/kudu/backup/TableMetadata.scala
A java/kudu-backup-common/src/test/resources/log4j2.properties
R java/kudu-backup-common/src/test/scala/org/apache/kudu/backup/TestBackupGraph.scala
M java/kudu-backup-tools/build.gradle
A java/kudu-backup-tools/src/main/resources/log4j2.properties
M java/kudu-backup-tools/src/main/scala/org/apache/kudu/backup/KuduBackupCLI.scala
M java/kudu-backup-tools/src/main/scala/org/apache/kudu/backup/KuduBackupCleaner.scala
M java/kudu-backup/build.gradle
M java/settings.gradle
14 files changed, 160 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.cloudera.org:29418/kudu refs/changes/47/13547/2
-- 
To view, visit http://gerrit.cloudera.org:8080/13547
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I6bee1f467d5652ced8412eef0315057e5b0d684e
Gerrit-Change-Number: 13547
Gerrit-PatchSet: 2
Gerrit-Owner: Grant Henke <gr...@apache.org>
Gerrit-Reviewer: Kudu Jenkins (120)
Gerrit-Reviewer: Mike Percy <mp...@apache.org>