Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@ private void checkTableEncryption(TableId tableId, boolean expectEncrypt) throws
args.add(new Path(hadoopConfDir, "hdfs-site.xml").toString());
}
args.add("-o");
args.add(TABLE_SERVICE_NAME_PROP + "=" + AESCryptoService.class.getName());
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Earlier in the test on line 75 it does the following

    cfg.setProperty(GenericCryptoServiceFactory.GENERAL_SERVICE_NAME_PROP,
        AESCryptoService.class.getName());

so w/ that setting the table prop is not needed, PrintInfo will still use AES

Copy link
Member

Choose a reason for hiding this comment

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

I don't think the per-table property would have worked anyway, since there's no table context when using PrintInfo using an RFile path. In theory, it could guess based on the path, but it shouldn't do that. If it tried to do that, I'd consider it a bug. The general prop is the right one to set for this.

args.add("-o");
args.add(INSTANCE_CRYPTO_FACTORY + "=" + GenericCryptoServiceFactory.class.getName());
log.info("Invoking PrintInfo with {}", args);
org.apache.accumulo.core.file.rfile.PrintInfo.main(args.toArray(new String[0]));
Expand Down