http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e4e1542/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html index 0a4b732..859992b 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html @@ -88,100 +88,105 @@ <span class="sourceLineNo">080</span> try {<a name="line.80"></a> <span class="sourceLineNo">081</span> SecureBulkLoadManager secureBulkLoadManager =<a name="line.81"></a> <span class="sourceLineNo">082</span> this.env.getRegionServerServices().getSecureBulkLoadManager();<a name="line.82"></a> -<span class="sourceLineNo">083</span> String bulkToken = secureBulkLoadManager.prepareBulkLoad(this.env.getRegion(),<a name="line.83"></a> -<span class="sourceLineNo">084</span> convert(request));<a name="line.84"></a> -<span class="sourceLineNo">085</span> done.run(PrepareBulkLoadResponse.newBuilder().setBulkToken(bulkToken).build());<a name="line.85"></a> -<span class="sourceLineNo">086</span> } catch (IOException e) {<a name="line.86"></a> -<span class="sourceLineNo">087</span> CoprocessorRpcUtils.setControllerException(controller, e);<a name="line.87"></a> -<span class="sourceLineNo">088</span> }<a name="line.88"></a> -<span class="sourceLineNo">089</span> done.run(null);<a name="line.89"></a> -<span class="sourceLineNo">090</span> }<a name="line.90"></a> -<span class="sourceLineNo">091</span><a name="line.91"></a> -<span class="sourceLineNo">092</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadRequest<a name="line.92"></a> -<span class="sourceLineNo">093</span> convert(PrepareBulkLoadRequest request)<a name="line.93"></a> -<span class="sourceLineNo">094</span> throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {<a name="line.94"></a> -<span class="sourceLineNo">095</span> byte [] bytes = request.toByteArray();<a name="line.95"></a> -<span class="sourceLineNo">096</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadRequest.Builder<a name="line.96"></a> -<span class="sourceLineNo">097</span> builder =<a name="line.97"></a> -<span class="sourceLineNo">098</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadRequest.<a name="line.98"></a> -<span class="sourceLineNo">099</span> newBuilder();<a name="line.99"></a> -<span class="sourceLineNo">100</span> builder.mergeFrom(bytes);<a name="line.100"></a> -<span class="sourceLineNo">101</span> return builder.build();<a name="line.101"></a> -<span class="sourceLineNo">102</span> }<a name="line.102"></a> -<span class="sourceLineNo">103</span><a name="line.103"></a> -<span class="sourceLineNo">104</span> @Override<a name="line.104"></a> -<span class="sourceLineNo">105</span> public void cleanupBulkLoad(RpcController controller, CleanupBulkLoadRequest request,<a name="line.105"></a> -<span class="sourceLineNo">106</span> RpcCallback<CleanupBulkLoadResponse> done) {<a name="line.106"></a> -<span class="sourceLineNo">107</span> try {<a name="line.107"></a> -<span class="sourceLineNo">108</span> SecureBulkLoadManager secureBulkLoadManager =<a name="line.108"></a> -<span class="sourceLineNo">109</span> this.env.getRegionServerServices().getSecureBulkLoadManager();<a name="line.109"></a> -<span class="sourceLineNo">110</span> secureBulkLoadManager.cleanupBulkLoad(this.env.getRegion(), convert(request));<a name="line.110"></a> -<span class="sourceLineNo">111</span> done.run(CleanupBulkLoadResponse.newBuilder().build());<a name="line.111"></a> -<span class="sourceLineNo">112</span> } catch (IOException e) {<a name="line.112"></a> -<span class="sourceLineNo">113</span> CoprocessorRpcUtils.setControllerException(controller, e);<a name="line.113"></a> -<span class="sourceLineNo">114</span> }<a name="line.114"></a> -<span class="sourceLineNo">115</span> done.run(null);<a name="line.115"></a> -<span class="sourceLineNo">116</span> }<a name="line.116"></a> -<span class="sourceLineNo">117</span><a name="line.117"></a> -<span class="sourceLineNo">118</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadRequest<a name="line.118"></a> -<span class="sourceLineNo">119</span> convert(CleanupBulkLoadRequest request)<a name="line.119"></a> -<span class="sourceLineNo">120</span> throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {<a name="line.120"></a> -<span class="sourceLineNo">121</span> byte [] bytes = request.toByteArray();<a name="line.121"></a> -<span class="sourceLineNo">122</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadRequest.Builder<a name="line.122"></a> -<span class="sourceLineNo">123</span> builder =<a name="line.123"></a> -<span class="sourceLineNo">124</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadRequest.<a name="line.124"></a> -<span class="sourceLineNo">125</span> newBuilder();<a name="line.125"></a> -<span class="sourceLineNo">126</span> builder.mergeFrom(bytes);<a name="line.126"></a> -<span class="sourceLineNo">127</span> return builder.build();<a name="line.127"></a> -<span class="sourceLineNo">128</span> }<a name="line.128"></a> -<span class="sourceLineNo">129</span><a name="line.129"></a> -<span class="sourceLineNo">130</span> @Override<a name="line.130"></a> -<span class="sourceLineNo">131</span> public void secureBulkLoadHFiles(RpcController controller, SecureBulkLoadHFilesRequest request,<a name="line.131"></a> -<span class="sourceLineNo">132</span> RpcCallback<SecureBulkLoadHFilesResponse> done) {<a name="line.132"></a> -<span class="sourceLineNo">133</span> boolean loaded = false;<a name="line.133"></a> -<span class="sourceLineNo">134</span> Map<byte[], List<Path>> map = null;<a name="line.134"></a> -<span class="sourceLineNo">135</span> try {<a name="line.135"></a> -<span class="sourceLineNo">136</span> SecureBulkLoadManager secureBulkLoadManager =<a name="line.136"></a> -<span class="sourceLineNo">137</span> this.env.getRegionServerServices().getSecureBulkLoadManager();<a name="line.137"></a> -<span class="sourceLineNo">138</span> BulkLoadHFileRequest bulkLoadHFileRequest = ConvertSecureBulkLoadHFilesRequest(request);<a name="line.138"></a> -<span class="sourceLineNo">139</span> map = secureBulkLoadManager.secureBulkLoadHFiles(this.env.getRegion(),<a name="line.139"></a> -<span class="sourceLineNo">140</span> convert(bulkLoadHFileRequest));<a name="line.140"></a> -<span class="sourceLineNo">141</span> loaded = map != null && !map.isEmpty();<a name="line.141"></a> -<span class="sourceLineNo">142</span> } catch (IOException e) {<a name="line.142"></a> -<span class="sourceLineNo">143</span> CoprocessorRpcUtils.setControllerException(controller, e);<a name="line.143"></a> -<span class="sourceLineNo">144</span> }<a name="line.144"></a> -<span class="sourceLineNo">145</span> done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(loaded).build());<a name="line.145"></a> -<span class="sourceLineNo">146</span> }<a name="line.146"></a> -<span class="sourceLineNo">147</span><a name="line.147"></a> -<span class="sourceLineNo">148</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest<a name="line.148"></a> -<span class="sourceLineNo">149</span> convert(BulkLoadHFileRequest request)<a name="line.149"></a> -<span class="sourceLineNo">150</span> throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {<a name="line.150"></a> -<span class="sourceLineNo">151</span> byte [] bytes = request.toByteArray();<a name="line.151"></a> -<span class="sourceLineNo">152</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest.Builder<a name="line.152"></a> -<span class="sourceLineNo">153</span> builder =<a name="line.153"></a> -<span class="sourceLineNo">154</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest.<a name="line.154"></a> -<span class="sourceLineNo">155</span> newBuilder();<a name="line.155"></a> -<span class="sourceLineNo">156</span> builder.mergeFrom(bytes);<a name="line.156"></a> -<span class="sourceLineNo">157</span> return builder.build();<a name="line.157"></a> -<span class="sourceLineNo">158</span> }<a name="line.158"></a> -<span class="sourceLineNo">159</span><a name="line.159"></a> -<span class="sourceLineNo">160</span> private BulkLoadHFileRequest ConvertSecureBulkLoadHFilesRequest(<a name="line.160"></a> -<span class="sourceLineNo">161</span> SecureBulkLoadHFilesRequest request) {<a name="line.161"></a> -<span class="sourceLineNo">162</span> BulkLoadHFileRequest.Builder bulkLoadHFileRequest = BulkLoadHFileRequest.newBuilder();<a name="line.162"></a> -<span class="sourceLineNo">163</span> RegionSpecifier region =<a name="line.163"></a> -<span class="sourceLineNo">164</span> ProtobufUtil.buildRegionSpecifier(RegionSpecifierType.REGION_NAME, this.env<a name="line.164"></a> -<span class="sourceLineNo">165</span> .getRegionInfo().getRegionName());<a name="line.165"></a> -<span class="sourceLineNo">166</span> bulkLoadHFileRequest.setRegion(region).setFsToken(request.getFsToken())<a name="line.166"></a> -<span class="sourceLineNo">167</span> .setBulkToken(request.getBulkToken()).setAssignSeqNum(request.getAssignSeqNum())<a name="line.167"></a> -<span class="sourceLineNo">168</span> .addAllFamilyPath(request.getFamilyPathList());<a name="line.168"></a> -<span class="sourceLineNo">169</span> return bulkLoadHFileRequest.build();<a name="line.169"></a> -<span class="sourceLineNo">170</span> }<a name="line.170"></a> -<span class="sourceLineNo">171</span><a name="line.171"></a> -<span class="sourceLineNo">172</span> @Override<a name="line.172"></a> -<span class="sourceLineNo">173</span> public Service getService() {<a name="line.173"></a> -<span class="sourceLineNo">174</span> return this;<a name="line.174"></a> +<span class="sourceLineNo">083</span><a name="line.83"></a> +<span class="sourceLineNo">084</span> String bulkToken = secureBulkLoadManager.prepareBulkLoad(this.env.getRegion(),<a name="line.84"></a> +<span class="sourceLineNo">085</span> convert(request));<a name="line.85"></a> +<span class="sourceLineNo">086</span> done.run(PrepareBulkLoadResponse.newBuilder().setBulkToken(bulkToken).build());<a name="line.86"></a> +<span class="sourceLineNo">087</span> } catch (IOException e) {<a name="line.87"></a> +<span class="sourceLineNo">088</span> CoprocessorRpcUtils.setControllerException(controller, e);<a name="line.88"></a> +<span class="sourceLineNo">089</span> }<a name="line.89"></a> +<span class="sourceLineNo">090</span> done.run(null);<a name="line.90"></a> +<span class="sourceLineNo">091</span> }<a name="line.91"></a> +<span class="sourceLineNo">092</span><a name="line.92"></a> +<span class="sourceLineNo">093</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadRequest<a name="line.93"></a> +<span class="sourceLineNo">094</span> convert(PrepareBulkLoadRequest request)<a name="line.94"></a> +<span class="sourceLineNo">095</span> throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {<a name="line.95"></a> +<span class="sourceLineNo">096</span> byte [] bytes = request.toByteArray();<a name="line.96"></a> +<span class="sourceLineNo">097</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadRequest.Builder<a name="line.97"></a> +<span class="sourceLineNo">098</span> builder =<a name="line.98"></a> +<span class="sourceLineNo">099</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadRequest.<a name="line.99"></a> +<span class="sourceLineNo">100</span> newBuilder();<a name="line.100"></a> +<span class="sourceLineNo">101</span> builder.mergeFrom(bytes);<a name="line.101"></a> +<span class="sourceLineNo">102</span> return builder.build();<a name="line.102"></a> +<span class="sourceLineNo">103</span> }<a name="line.103"></a> +<span class="sourceLineNo">104</span><a name="line.104"></a> +<span class="sourceLineNo">105</span> @Override<a name="line.105"></a> +<span class="sourceLineNo">106</span> public void cleanupBulkLoad(RpcController controller, CleanupBulkLoadRequest request,<a name="line.106"></a> +<span class="sourceLineNo">107</span> RpcCallback<CleanupBulkLoadResponse> done) {<a name="line.107"></a> +<span class="sourceLineNo">108</span> try {<a name="line.108"></a> +<span class="sourceLineNo">109</span> SecureBulkLoadManager secureBulkLoadManager =<a name="line.109"></a> +<span class="sourceLineNo">110</span> this.env.getRegionServerServices().getSecureBulkLoadManager();<a name="line.110"></a> +<span class="sourceLineNo">111</span> secureBulkLoadManager.cleanupBulkLoad(this.env.getRegion(), convert(request));<a name="line.111"></a> +<span class="sourceLineNo">112</span> done.run(CleanupBulkLoadResponse.newBuilder().build());<a name="line.112"></a> +<span class="sourceLineNo">113</span> } catch (IOException e) {<a name="line.113"></a> +<span class="sourceLineNo">114</span> CoprocessorRpcUtils.setControllerException(controller, e);<a name="line.114"></a> +<span class="sourceLineNo">115</span> }<a name="line.115"></a> +<span class="sourceLineNo">116</span> done.run(null);<a name="line.116"></a> +<span class="sourceLineNo">117</span> }<a name="line.117"></a> +<span class="sourceLineNo">118</span><a name="line.118"></a> +<span class="sourceLineNo">119</span> /**<a name="line.119"></a> +<span class="sourceLineNo">120</span> * Convert from CPEP protobuf 2.5 to internal protobuf 3.3.<a name="line.120"></a> +<span class="sourceLineNo">121</span> * @throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException<a name="line.121"></a> +<span class="sourceLineNo">122</span> */<a name="line.122"></a> +<span class="sourceLineNo">123</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadRequest<a name="line.123"></a> +<span class="sourceLineNo">124</span> convert(CleanupBulkLoadRequest request)<a name="line.124"></a> +<span class="sourceLineNo">125</span> throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {<a name="line.125"></a> +<span class="sourceLineNo">126</span> byte [] bytes = request.toByteArray();<a name="line.126"></a> +<span class="sourceLineNo">127</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadRequest.Builder<a name="line.127"></a> +<span class="sourceLineNo">128</span> builder =<a name="line.128"></a> +<span class="sourceLineNo">129</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadRequest.<a name="line.129"></a> +<span class="sourceLineNo">130</span> newBuilder();<a name="line.130"></a> +<span class="sourceLineNo">131</span> builder.mergeFrom(bytes);<a name="line.131"></a> +<span class="sourceLineNo">132</span> return builder.build();<a name="line.132"></a> +<span class="sourceLineNo">133</span> }<a name="line.133"></a> +<span class="sourceLineNo">134</span><a name="line.134"></a> +<span class="sourceLineNo">135</span> @Override<a name="line.135"></a> +<span class="sourceLineNo">136</span> public void secureBulkLoadHFiles(RpcController controller, SecureBulkLoadHFilesRequest request,<a name="line.136"></a> +<span class="sourceLineNo">137</span> RpcCallback<SecureBulkLoadHFilesResponse> done) {<a name="line.137"></a> +<span class="sourceLineNo">138</span> boolean loaded = false;<a name="line.138"></a> +<span class="sourceLineNo">139</span> Map<byte[], List<Path>> map = null;<a name="line.139"></a> +<span class="sourceLineNo">140</span> try {<a name="line.140"></a> +<span class="sourceLineNo">141</span> SecureBulkLoadManager secureBulkLoadManager =<a name="line.141"></a> +<span class="sourceLineNo">142</span> this.env.getRegionServerServices().getSecureBulkLoadManager();<a name="line.142"></a> +<span class="sourceLineNo">143</span> BulkLoadHFileRequest bulkLoadHFileRequest = ConvertSecureBulkLoadHFilesRequest(request);<a name="line.143"></a> +<span class="sourceLineNo">144</span> map = secureBulkLoadManager.secureBulkLoadHFiles(this.env.getRegion(),<a name="line.144"></a> +<span class="sourceLineNo">145</span> convert(bulkLoadHFileRequest));<a name="line.145"></a> +<span class="sourceLineNo">146</span> loaded = map != null && !map.isEmpty();<a name="line.146"></a> +<span class="sourceLineNo">147</span> } catch (IOException e) {<a name="line.147"></a> +<span class="sourceLineNo">148</span> CoprocessorRpcUtils.setControllerException(controller, e);<a name="line.148"></a> +<span class="sourceLineNo">149</span> }<a name="line.149"></a> +<span class="sourceLineNo">150</span> done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(loaded).build());<a name="line.150"></a> +<span class="sourceLineNo">151</span> }<a name="line.151"></a> +<span class="sourceLineNo">152</span><a name="line.152"></a> +<span class="sourceLineNo">153</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest<a name="line.153"></a> +<span class="sourceLineNo">154</span> convert(BulkLoadHFileRequest request)<a name="line.154"></a> +<span class="sourceLineNo">155</span> throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {<a name="line.155"></a> +<span class="sourceLineNo">156</span> byte [] bytes = request.toByteArray();<a name="line.156"></a> +<span class="sourceLineNo">157</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest.Builder<a name="line.157"></a> +<span class="sourceLineNo">158</span> builder =<a name="line.158"></a> +<span class="sourceLineNo">159</span> org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest.<a name="line.159"></a> +<span class="sourceLineNo">160</span> newBuilder();<a name="line.160"></a> +<span class="sourceLineNo">161</span> builder.mergeFrom(bytes);<a name="line.161"></a> +<span class="sourceLineNo">162</span> return builder.build();<a name="line.162"></a> +<span class="sourceLineNo">163</span> }<a name="line.163"></a> +<span class="sourceLineNo">164</span><a name="line.164"></a> +<span class="sourceLineNo">165</span> private BulkLoadHFileRequest ConvertSecureBulkLoadHFilesRequest(<a name="line.165"></a> +<span class="sourceLineNo">166</span> SecureBulkLoadHFilesRequest request) {<a name="line.166"></a> +<span class="sourceLineNo">167</span> BulkLoadHFileRequest.Builder bulkLoadHFileRequest = BulkLoadHFileRequest.newBuilder();<a name="line.167"></a> +<span class="sourceLineNo">168</span> RegionSpecifier region =<a name="line.168"></a> +<span class="sourceLineNo">169</span> ProtobufUtil.buildRegionSpecifier(RegionSpecifierType.REGION_NAME, this.env<a name="line.169"></a> +<span class="sourceLineNo">170</span> .getRegionInfo().getRegionName());<a name="line.170"></a> +<span class="sourceLineNo">171</span> bulkLoadHFileRequest.setRegion(region).setFsToken(request.getFsToken())<a name="line.171"></a> +<span class="sourceLineNo">172</span> .setBulkToken(request.getBulkToken()).setAssignSeqNum(request.getAssignSeqNum())<a name="line.172"></a> +<span class="sourceLineNo">173</span> .addAllFamilyPath(request.getFamilyPathList());<a name="line.173"></a> +<span class="sourceLineNo">174</span> return bulkLoadHFileRequest.build();<a name="line.174"></a> <span class="sourceLineNo">175</span> }<a name="line.175"></a> -<span class="sourceLineNo">176</span>}<a name="line.176"></a> +<span class="sourceLineNo">176</span><a name="line.176"></a> +<span class="sourceLineNo">177</span> @Override<a name="line.177"></a> +<span class="sourceLineNo">178</span> public Service getService() {<a name="line.178"></a> +<span class="sourceLineNo">179</span> return this;<a name="line.179"></a> +<span class="sourceLineNo">180</span> }<a name="line.180"></a> +<span class="sourceLineNo">181</span>}<a name="line.181"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e4e1542/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter.html index 9692785..10a7697 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter.html @@ -381,10 +381,10 @@ <span class="sourceLineNo">373</span> * @return true if the user is the owner of the snapshot,<a name="line.373"></a> <span class="sourceLineNo">374</span> * false otherwise or the snapshot owner field is not present.<a name="line.374"></a> <span class="sourceLineNo">375</span> */<a name="line.375"></a> -<span class="sourceLineNo">376</span> public static boolean isSnapshotOwner(final SnapshotDescription snapshot, final User user) {<a name="line.376"></a> -<span class="sourceLineNo">377</span> if (user == null) return false;<a name="line.377"></a> -<span class="sourceLineNo">378</span> if (!snapshot.hasOwner()) return false;<a name="line.378"></a> -<span class="sourceLineNo">379</span> return snapshot.getOwner().equals(user.getShortName());<a name="line.379"></a> +<span class="sourceLineNo">376</span> public static boolean isSnapshotOwner(org.apache.hadoop.hbase.client.SnapshotDescription snapshot,<a name="line.376"></a> +<span class="sourceLineNo">377</span> User user) {<a name="line.377"></a> +<span class="sourceLineNo">378</span> if (user == null) return false;<a name="line.378"></a> +<span class="sourceLineNo">379</span> return user.getShortName().equals(snapshot.getOwner());<a name="line.379"></a> <span class="sourceLineNo">380</span> }<a name="line.380"></a> <span class="sourceLineNo">381</span><a name="line.381"></a> <span class="sourceLineNo">382</span> public static boolean isSecurityAvailable(Configuration conf) throws IOException {<a name="line.382"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e4e1542/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.html index 9692785..10a7697 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.html @@ -381,10 +381,10 @@ <span class="sourceLineNo">373</span> * @return true if the user is the owner of the snapshot,<a name="line.373"></a> <span class="sourceLineNo">374</span> * false otherwise or the snapshot owner field is not present.<a name="line.374"></a> <span class="sourceLineNo">375</span> */<a name="line.375"></a> -<span class="sourceLineNo">376</span> public static boolean isSnapshotOwner(final SnapshotDescription snapshot, final User user) {<a name="line.376"></a> -<span class="sourceLineNo">377</span> if (user == null) return false;<a name="line.377"></a> -<span class="sourceLineNo">378</span> if (!snapshot.hasOwner()) return false;<a name="line.378"></a> -<span class="sourceLineNo">379</span> return snapshot.getOwner().equals(user.getShortName());<a name="line.379"></a> +<span class="sourceLineNo">376</span> public static boolean isSnapshotOwner(org.apache.hadoop.hbase.client.SnapshotDescription snapshot,<a name="line.376"></a> +<span class="sourceLineNo">377</span> User user) {<a name="line.377"></a> +<span class="sourceLineNo">378</span> if (user == null) return false;<a name="line.378"></a> +<span class="sourceLineNo">379</span> return user.getShortName().equals(snapshot.getOwner());<a name="line.379"></a> <span class="sourceLineNo">380</span> }<a name="line.380"></a> <span class="sourceLineNo">381</span><a name="line.381"></a> <span class="sourceLineNo">382</span> public static boolean isSecurityAvailable(Configuration conf) throws IOException {<a name="line.382"></a>
