-
Notifications
You must be signed in to change notification settings - Fork 8.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HADOOP-19299. HttpReferrerAuditHeader resilience (#7095)
* HttpReferrerAuditHeader is thread safe, copying the lists/maps passed in and using synchronized methods when necessary. * All exceptions raised when building referrer header are caught and swallowed. * The first such error is logged at warn, * all errors plus stack are logged at debug Contributed by Steve Loughran
- Loading branch information
1 parent
bb379f8
commit 8b39378
Showing
5 changed files
with
146 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/audit/impl/ReferrerExtractor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.hadoop.fs.s3a.audit.impl; | ||
|
||
import org.apache.hadoop.fs.s3a.audit.AuditSpanS3A; | ||
import org.apache.hadoop.fs.store.audit.HttpReferrerAuditHeader; | ||
|
||
/** | ||
* Extract the referrer from a LoggingAuditor through a package-private | ||
* method. | ||
*/ | ||
public final class ReferrerExtractor { | ||
|
||
private ReferrerExtractor() { | ||
} | ||
|
||
/** | ||
* Get the referrer provided the span is an instance or | ||
* subclass of LoggingAuditSpan. | ||
* If wrapped by a {@code WrappingAuditSpan}, it will be extracted. | ||
* @param auditor the auditor. | ||
* @param span span | ||
* @return the referrer | ||
* @throws ClassCastException if a different span type was passed in | ||
*/ | ||
public static HttpReferrerAuditHeader getReferrer(LoggingAuditor auditor, | ||
AuditSpanS3A span) { | ||
AuditSpanS3A sp; | ||
if (span instanceof ActiveAuditManagerS3A.WrappingAuditSpan) { | ||
sp = ((ActiveAuditManagerS3A.WrappingAuditSpan) span).getSpan(); | ||
} else { | ||
sp = span; | ||
} | ||
return auditor.getReferrer(sp); | ||
} | ||
} |