[ 
https://issues.apache.org/jira/browse/HADOOP-13192?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15296260#comment-15296260
 ] 

ASF GitHub Bot commented on HADOOP-13192:
-----------------------------------------

GitHub user zhudebin opened a pull request:

    https://github.com/apache/hadoop/pull/95

    fix bug HADOOP-13192

    fix bug HADOOP-13192

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/zhudebin/hadoop branch-2.6-fixbug

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/hadoop/pull/95.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #95
    
----
commit 0b1e66f01dae1c5558e897e35b1cbe533d9c4542
Author: Andrew Wang <w...@apache.org>
Date:   2015-03-24T05:00:34Z

    HDFS-7960. The full block report should prune zombie storages even if 
they're not empty. Contributed by Colin McCabe and Eddy Xu.
    
    (cherry picked from commit 50ee8f4e67a66aa77c5359182f61f3e951844db6)
    (cherry picked from commit 2f46ee50bd4efc82ba3d30bd36f7637ea9d9714e)
    
    Conflicts:
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
        
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java
        
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
        
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java
        
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestTriggerBlockReport.java
    
    (cherry picked from commit 03d4af39e794dc03d764122077b434d658b6405e)

commit bc8728cd27870e048fd90d1e07ea92e8c9ed310d
Author: Kihwal Lee <kih...@apache.org>
Date:   2015-03-30T15:11:25Z

    HDFS-7742. Favoring decommissioning node for replication can cause a block 
to stay
    underreplicated for long periods. Contributed by Nathan Roberts.
    (cherry picked from commit 04ee18ed48ceef34598f954ff40940abc9fde1d2)
    
    (cherry picked from commit c4cedfc1d601127430c70ca8ca4d4e2ee2d1003d)
    (cherry picked from commit c6b68a82adea8de488b255594d35db8e01f5fc8f)

commit 8a9665a586624cfe7f11ad9e21976465e0bb0e21
Author: Junping Du <junping...@apache.org>
Date:   2015-04-02T19:13:03Z

    MAPREDUCE-6303. Read timeout when retrying a fetch error can be fatal to a 
reducer. Contributed by Jason Lowe.
    (cherry picked from commit eccb7d46efbf07abcc6a01bd5e7d682f6815b824)
    
    (cherry picked from commit cacadea632f7ab6fe4fdb1432e1a2c48e8ebd55f)
    (cherry picked from commit 2abd4f61075739514fb3e63b118448895be02a30)

commit c3f5ea11eca30a617cab2a716dd08dff20db3791
Author: Colin Patrick Mccabe <cmcc...@cloudera.com>
Date:   2015-04-06T15:54:46Z

    HDFS-7999. FsDatasetImpl#createTemporary sometimes holds the FSDatasetImpl 
lock for a very long time (sinago via cmccabe)
    
    (cherry picked from commit 28bebc81db8bb6d1bc2574de7564fe4c595cfe09)
    (cherry picked from commit a827089905524e10638c783ba908a895d621911d)
    
    Conflicts:
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
    
    (cherry picked from commit c3a3092c37926eca75ea149c4c061742f6599b40)

commit 31d30e8111d7c4ef6400b5fe51cc67b17ab34908
Author: Arpit Agarwal <a...@apache.org>
Date:   2015-04-08T18:38:21Z

    HDFS-8072. Reserved RBW space is not released if client terminates while 
writing block. (Arpit Agarwal)
    
    (cherry picked from commit f0324738c9db4f45d2b1ec5cfb46c5f2b7669571)
    
    Conflicts:
        
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/extdataset/ExternalReplicaInPipeline.java
    
    (cherry picked from commit de21de7e2243ef8a89082121d838b88e3c10f05b)

commit 619f7938466e907f335941bbbbd928c6272a0482
Author: Kihwal Lee <kih...@apache.org>
Date:   2015-04-08T20:39:25Z

    HDFS-8046. Allow better control of getContentSummary. Contributed by Kihwal 
Lee.
    (cherry picked from commit 285b31e75e51ec8e3a796c2cb0208739368ca9b8)
    
    (cherry picked from commit 7e622076d41a85fc9a8600fb270564a085f5cd83)
    
    Conflicts:
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
    
    (cherry picked from commit 1ef5e0b18066ca949adcf4c55a41f186c47e7264)

commit 752e3da738080cf7259b9085b736b42956d0bf1e
Author: Vinod Kumar Vavilapalli <vino...@apache.org>
Date:   2015-04-09T20:08:53Z

    YARN-3055. Fixed ResourceManager's DelegationTokenRenewer to not stop token 
renewal of applications part of a bigger workflow. Contributed by Daryn Sharp.
    
    (cherry picked from commit 9c5911294e0ba71aefe4763731b0e780cde9d0ca)
    (cherry picked from commit 1ff3fd33ed6f2ac09c774cc42b0107c5dbd9c19d)
    (cherry picked from commit 82c722aae86669325672dd10840447434f15e7fd)

commit dcc0d4658c9bc7f488cecdcbc05e9216234b36aa
Author: Akira Ajisaka <aajis...@apache.org>
Date:   2015-04-10T16:29:08Z

    MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li.
    
    (cherry picked from commit 4cec9975c0e2c2fcca090888dc2c5e149c5be1e9)
    (cherry picked from commit 3de0bf9a35094f3c2ac216992d861729251b6a3d)
    (cherry picked from commit c3b2b377f19293797a88f4636f07e2ab8e18c78b)

commit b7e7896410bdd8aac5a8b9f9327227542e730ece
Author: Jing Zhao <ji...@apache.org>
Date:   2015-04-14T22:05:23Z

    HDFS-8127. NameNode Failover during HA upgrade can cause DataNode to 
finalize upgrade. Contributed by Jing Zhao.
    
    (cherry picked from commit fddd55279d0bdd08b3b40aba6fe2ded1d2e0d846)
    (cherry picked from commit 38b031d6bab8527698bd186887d301bd6a63cf01)
    
    Conflicts:
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNUpgradeUtil.java
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java
    
    (cherry picked from commit b4e227e65d3a81150f46aac5e987d759defc1452)

commit 61f2ddb125f6af1775ce5d219f22eb079071869c
Author: Wangda Tan <wan...@apache.org>
Date:   2015-04-18T00:11:22Z

    YARN-3493. RM fails to come up with error "Failed to load/recover state" 
when mem settings are changed. (Jian He via wangda)
    
    (cherry picked from commit f65eeb412d140a3808bcf99344a9f3a965918f70)
    (cherry picked from commit e7cbecddc3e7ca5386c71aa4deb67f133611415c)
    (cherry picked from commit 9d47d5aa5bffe427c4a77260f7ccc039d446e1fd)

commit e081593042de460b5930dadd0bd3aa313fe09873
Author: Wangda Tan <wan...@apache.org>
Date:   2015-04-18T00:22:27Z

    YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when 
calling getQueue (Jason Lowe via wangda)
    
    (cherry picked from commit f47a5763acd55cb0b3f16152c7f8df06ec0e09a9)
    (cherry picked from commit 3316cd4357ff6ccc4c76584813092adb1c2b4d43)
    (cherry picked from commit 24d45ee9544abcfcf9e611ab835ec2f824333670)

commit 2f66dff7cec001064332cfcf7a0e8873cd98482e
Author: Karthik Kambatla <ka...@apache.org>
Date:   2015-03-04T22:42:07Z

    MAPREDUCE-6267. Refactor JobSubmitter#copyAndConfigureFiles into it's own 
class. (Chris Trezzo via kasha)
    
    (cherry picked from commit c66c3ac6bf9f63177279feec3f2917e4b882e2bc)
    (cherry picked from commit f4d6c5e337e76dc408c9c8f19e306c3f4ba80d8e)
    (cherry picked from commit 2b9cac26ec5457ad4e18ec418ff8249c37861eb8)

commit c253ac68ebb2f07a20af89636ea611fb887739f2
Author: Robert Kanter <rkan...@apache.org>
Date:   2015-04-20T21:14:08Z

    MAPREDUCE-6238. MR2 can't run local jobs with -libjars command options 
which is a regression from MR1 (zxu via rkanter)
    
    (cherry picked from commit d50e8f09287deeb51012d08e326a2ed71a6da869)
    (cherry picked from commit 756c2542930756fef1cbff82056b418070f8d55f)
    (cherry picked from commit 4f0fd74880e58958d89ca1cd4b7f665520595b2c)

commit 736ebeca3347243fa122f976532ed2536e51b6f5
Author: Gera Shegalov <g...@apache.org>
Date:   2015-04-21T18:57:42Z

    HADOOP-11812. Implement listLocatedStatus for ViewFileSystem to speed up 
split calculation (gera)
    
    (cherry picked from commit 6d2cf9fbbd02482315a091ab07af26e40cc5134f)
    (cherry picked from commit 1544c63602089b690e850e0e30af4589513a2371)

commit e0e93e9f8d5aaf2eb37d4e91f29f7395109109a2
Author: Steve Loughran <ste...@apache.org>
Date:   2015-04-23T20:39:30Z

    HADOOP-11730. Regression: s3n read failure recovery broken.  (Takenori Sato 
via stevel)
    
    (cherry picked from commit a6a5d1d6b5ee76c829ba7b54a4ad619f7b986681)

commit 9df4b7c10e38d517fc19826657e0f3779d543f07
Author: Colin Patrick Mccabe <cmcc...@cloudera.com>
Date:   2015-03-15T05:36:46Z

    HDFS-7915. The DataNode can sometimes allocate a ShortCircuitShm slot and 
fail to tell the DFSClient about it because of a network error (cmccabe)
    
    (cherry picked from commit bc9cb3e271b22069a15ca110cd60c860250aaab2)
    (cherry picked from commit c71b54fa32ef9149692269a95c918506e338e181)

commit 181281cfcada2246af998b388e9f7e96d0228022
Author: Colin Patrick Mccabe <cmcc...@cloudera.com>
Date:   2015-04-24T02:03:44Z

    HDFS-8070. Pre-HDFS-7915 DFSClient cannot use short circuit on 
post-HDFS-7915 DataNode (cmccabe)
    
    (cherry picked from commit a8898445dc9b5cdb7230e2e23a57393c9f378ff0)
    (cherry picked from commit 3d0385c3c8fab72be02453a158c7692212ab3b5e)

commit 8770f1f03952661f49aea65ae6498be676677812
Author: Colin Patrick Mccabe <cmcc...@cloudera.com>
Date:   2015-04-24T01:59:52Z

    HADOOP-11802. DomainSocketWatcher thread terminates sometimes after there 
is an I/O error during requestShortCircuitShm (cmccabe)
    
    (cherry picked from commit a0e0a63209b5eb17dca5cc503be36aa52defeabd)
    (cherry picked from commit 788b76761d5dfadf688406d50169e95401fe5d33)

commit 9af5b1dcd08c41df026bb86129abd42863baccef
Author: Xuan <xg...@apache.org>
Date:   2015-01-26T03:37:57Z

    YARN-3024. LocalizerRunner should give DIE action when all resources are
    localized. Contributed by Chengbing Liu
    
    (cherry picked from commit 0d6bd62102f94c55d59f7a0a86a684e99d746127)
    (cherry picked from commit a7696b3fbfacd98a892bbb3678663658c7b9d2bd)
    (cherry picked from commit 9e30232004ab7c3c3bfde3b8b27c37fa7065f6be)

commit 6ade6b5051fc16472ada1d5c73792999e74aa67c
Author: Karthik Kambatla <ka...@apache.org>
Date:   2015-04-26T16:13:46Z

    YARN-3464. Race condition in LocalizerRunner kills localizer before 
localizing all resources. (Zhihai Xu via kasha)
    
    (cherry picked from commit 47279c3228185548ed09c36579b420225e4894f5)
    (cherry picked from commit 4045c41afe440b773d006e962bf8a5eae3fdc284)
    (cherry picked from commit 6f2cc0dfa8f21984ecdab59dc087ccf525934930)

commit 262275d561a3d138e67942a35b7c15f1ef01bfc8
Author: Vinod Kumar Vavilapalli <vino...@apache.org>
Date:   2015-04-27T21:58:16Z

    MAPREDUCE-6324. Fixed MapReduce uber jobs to not fail the udpate of AM-RM 
tokens when they roll-over. Contributed by Jason Lowe.
    
    (cherry picked from commit 9fc32c5c4d1d5f50c605bdb0e3b13f44c86660c8)
    (cherry picked from commit 32dc13d907a416049bdb7deff429725bd6dbcb49)
    (cherry picked from commit aad56fe3a2f29e73a013b9afa9b44b151a34e0f3)

commit c90f025e903573b5e94c2d205cc1e3a6691d4294
Author: Gera Shegalov <g...@apache.org>
Date:   2015-05-01T22:44:36Z

    HADOOP-11491. HarFs incorrectly declared as requiring an authority. (Brahma 
Reddy Battula via gera)
    
    (cherry picked from commit f343f8657e2b01773a32c2c7d960dc368954b42e)
    (cherry picked from commit 58970d69de8a1662e4548cd6d4ca460dd70562f8)

commit 41601eae6b266ce88e47a06a1dc765cfc296b640
Author: Jason Lowe <jl...@apache.org>
Date:   2015-05-04T19:02:39Z

    MAPREDUCE-5649. Reduce cannot use more than 2G memory for the final merge. 
Contributed by Gera Shegalov
    (cherry picked from commit 7dc3c1203d1ab14c09d0aaf0869a5bcdfafb0a5a)
    
    (cherry picked from commit 87c2d915f1cc799cb4020c945c04d3ecb82ee963)
    (cherry picked from commit 1da62ba736f5f161a18a52b7ca0d212786f3848c)

commit 08006b84f8cb6119bd17f6cfc8da2598e24346ca
Author: Xiaoyu Yao <x...@apache.org>
Date:   2015-05-05T20:41:14Z

    HDFS-8219. setStoragePolicy with folder behavior is different after cluster 
restart. (surendra singh lilhore via Xiaoyu Yao)
    
    (cherry picked from commit 0100b155019496d077f958904de7d385697d65d9)
    (cherry picked from commit e68e8b3b5cff85bfd8bb5b00b9033f63577856d6)
    
    Conflicts:
        
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java
    
    (cherry picked from commit b054cb68fa0fc6d1e9e77ac84575731e7d1ec0c7)

commit bbed4e67a99196a750e9cb5ff9f9595b9bc7a196
Author: Kihwal Lee <kih...@apache.org>
Date:   2015-05-08T14:32:07Z

    HDFS-7894. Rolling upgrade readiness is not updated in jmx until query 
command is issued. Contributed by Brahma Reddy Battula.
    (cherry picked from commit 6f622672b62aa8d719060063ef0e47480cdc8655)
    
    (cherry picked from commit 802a5775f3522c57c60ae29ecb9533dbbfecfe76)
    (cherry picked from commit 995382c5234ad6c07f327e5d1f2a1c7e391a0b60)

commit 51d5fc62c2eeda42f64652980693157dc9686812
Author: Colin Patrick Mccabe <cmcc...@cloudera.com>
Date:   2014-10-27T16:53:16Z

    HDFS-7278. Add a command that allows sysadmins to manually trigger full 
block reports from a DN (cmccabe)
    (cherry picked from commit baf794dc404ac54f4e8332654eadfac1bebacb8f)
    
    (cherry picked from commit 5f3d967aaefa0b20ef1586b4048b8fa5345d2618)
    
    Conflicts:
        hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm
    
    (cherry picked from commit a776ef5ad2876b9acf6cf89824c306783f7759f1)

commit 6c0ad99b9d45fbad0b860944dda92e1a7a989dc5
Author: Tsuyoshi Ozawa <oz...@apache.org>
Date:   2015-05-12T15:28:17Z

    MAPREDUCE-6361. NPE issue in shuffle caused by concurrent issue between 
copySucceeded() in one thread and copyFailed() in another thread on the same 
host. Contributed by Junping Du.
    
    (cherry picked from commit f4e2b3cc0b1f4e49c306bc09a9dddd0495225bb2)
    (cherry picked from commit fb5b0ebb459cc8812084090a7ce7ac29e2ad147c)
    (cherry picked from commit 3a3dcf0bb689d6aa8bc524a31799067702814674)

commit 778da79e6f28f5528e107f9b3122925f4a0f05b2
Author: Jason Lowe <jl...@apache.org>
Date:   2015-05-13T21:06:47Z

    YARN-3641. NodeManager: stopRecoveryStore() shouldn't be skipped when 
exceptions happen in stopping NM's sub-services. Contributed by Junping Du
    (cherry picked from commit 711d77cc54a64b2c3db70bdacc6bf2245c896a4b)
    
    (cherry picked from commit a81ad814610936a02e55964fbe08f7b33fe29b23)
    (cherry picked from commit aa82b0684554be8d09f6fcd88826f167922280cc)

commit 7b1a71a7ad5602dbeb5758a650812413c277c21c
Author: Xuan <xg...@apache.org>
Date:   2015-05-16T05:39:49Z

    YARN-3526. ApplicationMaster tracking URL is incorrectly redirected on a 
QJM cluster. Contributed by Weiwei Yang
    
    (cherry picked from commit b0ad644083a0dfae3a39159ac88b6fc09d846371)
    (cherry picked from commit 802676e1be350785d8c0ad35f6676eeb85b2467b)
    (cherry picked from commit 2cadeb9e017c6a75db16e1f23b2accda04f12298)

commit b3ca4dfaff627a04a1a07aa305e1d30651e66056
Author: Kihwal Lee <kih...@apache.org>
Date:   2015-05-08T21:37:26Z

    HDFS-8245. Standby namenode doesn't process DELETED_BLOCK if the addblock 
request is in edit log. Contributed by Rushabh S Shah.
    (cherry picked from commit 2d4ae3d18bc530fa9f81ee616db8af3395705fb9)
    
    (cherry picked from commit f264a5aeede7e144af11f5357c7f901993de8e12)
    
    Conflicts:
        
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
    
    (cherry picked from commit 470019e9b88e0fcede926442b91d102b595c7ace)

----


> org.apache.hadoop.util.LineReader  match recordDelimiter has a bug
> ------------------------------------------------------------------
>
>                 Key: HADOOP-13192
>                 URL: https://issues.apache.org/jira/browse/HADOOP-13192
>             Project: Hadoop Common
>          Issue Type: Bug
>          Components: util
>    Affects Versions: 2.6.2
>            Reporter: binde
>   Original Estimate: 5m
>  Remaining Estimate: 5m
>
> org.apache.hadoop.util.LineReader.readCustomLine()  has a bug,
> when line is   aaaabccc, recordDelimiter is aaab, the result should be a,ccc,
> show the code on line 310:
>       for (; bufferPosn < bufferLength; ++bufferPosn) {
>         if (buffer[bufferPosn] == recordDelimiterBytes[delPosn]) {
>           delPosn++;
>           if (delPosn >= recordDelimiterBytes.length) {
>             bufferPosn++;
>             break;
>           }
>         } else if (delPosn != 0) {
>           bufferPosn--;
>           delPosn = 0;
>         }
>       }
> shoud be :
>       for (; bufferPosn < bufferLength; ++bufferPosn) {
>         if (buffer[bufferPosn] == recordDelimiterBytes[delPosn]) {
>           delPosn++;
>           if (delPosn >= recordDelimiterBytes.length) {
>             bufferPosn++;
>             break;
>           }
>         } else if (delPosn != 0) {
>          // ------------- change here ------------- start ----
>           bufferPosn -= delPosn;
>          // ------------- change here ------------- end ----
>   
>           delPosn = 0;
>         }
>       }



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

---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org

Reply via email to