[ 
https://issues.apache.org/jira/browse/HDFS-8377?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Xiao Chen updated HDFS-8377:
----------------------------
    Attachment: HDFS-8377.revert.patch

Conflicts:
- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
-       
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
-        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/PortUnificationServerHandler.java
-        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/webhdfs/WebHdfsHandler.java
-        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FSImageHandler.java

Reverting has some trivial conflicts, and hence some manual tweaks:
- CHANGES.txt no longer exists
- PortUnificationServerHandler is added by this patch. HDFS-9711 had some minor 
changes to the class. Simply removing this class.
- WebHdfsHandler had import conflicts due to HDFS-7766.
- FSImageHandler has a whitespace conflict due to HDFS-8462.
- DatanodeHttpServer also due to HDFS-9711. Had to manually edit the code about 
PortUnificationServerHandler, similar to another change in HDFS-9711 to add 
handlers.
- Import conflicts.
- Intentionally didn't revert the netty version update, so HADOOP-13866 can 
upgrade upon this. This has been there for a while so some trunk code depends 
on netty 4.1.0 already.

> Support HTTP/2 in datanode
> --------------------------
>
>                 Key: HDFS-8377
>                 URL: https://issues.apache.org/jira/browse/HDFS-8377
>             Project: Hadoop HDFS
>          Issue Type: Sub-task
>            Reporter: Duo Zhang
>            Assignee: Duo Zhang
>             Fix For: 2.8.0, 3.0.0-alpha1
>
>         Attachments: HDFS-8377.1.patch, HDFS-8377.2.patch, HDFS-8377.patch, 
> HDFS-8377.revert.patch
>
>




--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to