Commit Graph

2857 Commits

Author SHA1 Message Date
Tsz-Wo Nicholas Sze 10b97f6655 HDFS-8361. Choose SSD over DISK in block placement. 2015-06-15 17:18:09 -07:00
Tsz-Wo Nicholas Sze 95483513ed Move HDFS-8540 to 2.8 in CHANGES.txt. 2015-06-15 17:02:45 -07:00
Tsz-Wo Nicholas Sze 9ba29f081b HDFS-8540. Mover should exit with NO_MOVE_BLOCK if no block can be moved. Contributed by surendra singh lilhore 2015-06-15 16:28:37 -07:00
Tsz-Wo Nicholas Sze 5c111a5192 HDFS-8576. Lease recovery should return true if the lease can be released and the file can be closed. Contributed by J.Andreina 2015-06-15 16:09:32 -07:00
Arpit Agarwal ea9a9b3d7e HDFS-8607. TestFileCorruption doesn't work as expected. (Contributed by Walter Su) 2015-06-15 10:12:07 -07:00
Arpit Agarwal d07f3804b0 HDFS-8595. TestCommitBlockSynchronization fails in branch-2.7. (Patch applies to all branches). (Contributed by Arpit Agarwal) 2015-06-14 16:24:36 -07:00
Yongjun Zhang cd578fa289 HDFS-8596. TestDistributedFileSystem et al tests are broken in branch-2 due to incorrect setting of "datanode" attribute. Contributed by Yongjun Zhang.
(cherry picked from commit b0dc291961)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
2015-06-14 12:01:28 -07:00
cnauroth 92144ca75c HDFS-8593. Calculation of effective layout version mishandles comparison to current layout version in storage. Contributed by Chris Nauroth.
(cherry picked from commit b8341f1cd8)
2015-06-13 10:38:03 -07:00
Andrew Wang 2776255ed6 HDFS-8499. Refactor BlockInfo class hierarchy with static helper class. Contributed by Zhe Zhang.
(cherry picked from commit 355e98ab7c7dd997378a8624f642199713467fb8)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java
2015-06-12 11:39:02 -07:00
Colin Patrick Mccabe 378bb484bb HDFS-7923. The DataNodes should rate-limit their full block reports by asking the NN on heartbeat messages (cmccabe)
(cherry picked from commit 12b5b06c06)
2015-06-12 11:29:05 -07:00
Haohui Mai f1ee2eaf86 HDFS-8572. DN always uses HTTP/localhost@REALM principals in SPNEGO. Contributed by Haohui Mai. 2015-06-11 18:59:53 -07:00
Arpit Agarwal a560e654d9 HDFS-8583. Document that NFS gateway does not work with rpcbind on SLES 11. (Arpit Agarwal) 2015-06-11 15:08:50 -07:00
Colin Patrick Mccabe 754dd3496c HDFS-8566. HDFS documentation about debug commands wrongly identifies them as "hdfs dfs" commands (Surendra Singh Lilhore via Colin P. McCabe)
(cherry picked from commit 587309bbba)
2015-06-11 14:28:41 -07:00
Andrew Wang 086eb49424 HDFS-8573. Move creation of restartMeta file logic from BlockReceiver to ReplicaInPipeline. Contributed by Eddy Xu.
(cherry picked from commit b258b344bb)
2015-06-11 10:12:40 -07:00
Andrew Wang 9523e2c098 HDFS-8549. Abort the balancer if an upgrade is in progress.
(cherry picked from commit a7a7768341)
2015-06-10 13:43:00 -07:00
Xiaoyu Yao d8d9041187 HDFS-8568. TestClusterId#testFormatWithEmptyClusterIdOption is failing. Contributed by Rakesh R.
(cherry picked from commit 3c2397cb04)
2015-06-09 12:21:53 -07:00
Xiaoyu Yao 116a72096d HDFS-8552. Fix hdfs CLI usage message for namenode and zkfc. Contributed by Brahma Reddy Battula
(cherry picked from commit 927577c87c)
2015-06-08 22:03:07 -07:00
cnauroth cc960734e4 HDFS-8553. Document hdfs class path options. Contributed by Brahma Reddy Battula.
(cherry picked from commit d2832b3d42)
2015-06-08 16:15:53 -07:00
cnauroth 8ee50d8ca7 HDFS-8554. TestDatanodeLayoutUpgrade fails on Windows. Contributed by Chris Nauroth.
(cherry picked from commit 0e80d51983)
2015-06-08 08:39:14 -07:00
cnauroth 953c4a049a HDFS-8539. Hdfs doesnt have class debug in windows. Contributed by Anu Engineer.
(cherry picked from commit a6cb4894b4)
2015-06-07 13:02:01 -07:00
Xiaoyu Yao c8dc113943 HDFS-8116. Cleanup uncessary if LOG.isDebugEnabled() from RollingWindowManager. Contributed by Brahma Reddy Battula.
(cherry picked from commit b61b489995)
2015-06-06 18:48:52 -07:00
cnauroth f99744b7a0 HDFS-8432. Introduce a minimum compatible layout version to allow downgrade in more rolling upgrade use cases. Contributed by Chris Nauroth.
(cherry picked from commit 71de367c5e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupImage.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
2015-06-06 09:45:46 -07:00
Xiaoyu Yao 1a6cdf97bb HDFS-8522. Change heavily recorded NN logs from INFO to DEBUG level. Contributed by xyao. 2015-06-05 17:33:06 -07:00
Andrew Wang 320e4cc0e7 HDFS-8535. Clarify that dfs usage in dfsadmin -report output includes all block replicas. Contributed by Eddy Xu.
(cherry picked from commit b2540f486e)
2015-06-04 15:35:12 -07:00
Andrew Wang ccc834395b HDFS-8532. Make the visibility of DFSOutputStream#streamer member variable to private. Contributed by Rakesh R.
(cherry picked from commit 5149dc7b97)
2015-06-04 11:09:28 -07:00
Kihwal Lee f0f277ddd0 HDFS-8463. Calling DFSInputStream.seekToNewSource just after stream creation causes NullPointerException. Contributed by Masatake Iwasaki.
(cherry picked from commit ade6d9a61e)
2015-06-04 12:52:49 -05:00
Vinayakumar B 539ff92c2a HDFS-3716. Purger should remove stale fsimage ckpt files (Contributed by J.Andreina)
(cherry picked from commit c59e745630)
2015-06-03 15:31:01 +05:30
Vinayakumar B 0ed9c2d8fe HDFS-8523. Remove usage information on unsupported operation 'fsck -showprogress' from branch-2 (Contributed by J.Andreina) 2015-06-03 15:15:44 +05:30
Vinayakumar B 4bb725b4dd HDFS-8470. fsimage loading progress should update inode, delegation token and cache pool count. (Contributed by surendra singh lilhore)
(cherry picked from commit e965dcec37)
2015-06-03 14:25:12 +05:30
Vinayakumar B 066e45bcb6 HDFS-8270. create() always retried with hardcoded timeout when file already exists with open lease (Contributed by J.Andreina)
(cherry picked from commit 54f83d9bd9)
2015-06-03 12:12:22 +05:30
Colin Patrick Mccabe 12497b0543 HDFS-8521. Add VisibleForTesting annotation to BlockPoolSlice#selectReplicaToDelete. (cmccabe)
(cherry picked from commit 806e407ac8)
2015-06-02 20:06:53 -07:00
Andrew Wang a80a68c298 HDFS-8513. Rename BlockPlacementPolicyRackFaultTolarent to BlockPlacementPolicyRackFaultTolerant. (wang)
(cherry picked from commit c1d50a91f7)
2015-06-02 15:48:31 -07:00
Andrew Wang 379ece15fe HDFS-8386. Improve synchronization of 'streamer' reference in DFSOutputStream. Contributed by Rakesh R.
(cherry picked from commit efc510a570)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
2015-06-02 15:42:27 -07:00
Colin Patrick Mccabe 17e369511d HDFS-8486. DN startup may cause severe data loss (Daryn Sharp via Colin P. McCabe)
(cherry picked from commit 03fb5c6425)
2015-06-02 11:42:08 -07:00
Vinayakumar B d1da842f86 HDFS-8256. '-storagepolicies , -blockId ,-replicaDetails ' options are missed out in usage and from documentation (Contributed by J.Andreina)
(cherry picked from commit a2bd6217eb)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
2015-06-02 16:25:53 +05:30
Jing Zhao 640ea994ed HDFS-8489. Subclass BlockInfo to represent contiguous blocks. Contributed by Zhe Zhang.
(cherry picked from commit cdc13efb1a)
2015-06-01 11:45:04 -07:00
Tsuyoshi Ozawa b91cadcafd HDFS-8490. Typo in trace enabled log in ExceptionHandler of WebHDFS. Contributed by Archana T.
(cherry picked from commit c2356cb0bc)
2015-06-01 00:42:11 +09:00
Jing Zhao 17fb442a4c HDFS-7609. Avoid retry cache collision when Standby NameNode loading edits. Contributed by Ming Ma.
(cherry picked from commit 7817674a3a)
2015-05-29 11:11:01 -07:00
Vinayakumar B 983c1d3969 HDFS-7401. Add block info to DFSInputStream' WARN message when it adds node to deadNodes (Contributed by Arshad Mohammad)
(cherry picked from commit b75df697e0)
2015-05-29 16:36:39 +05:30
Akira Ajisaka e7b81710dd HDFS-8443. Document dfs.namenode.service.handler.count in hdfs-site.xml. Contributed by J.Andreina.
(cherry picked from commit d725dd8af6)
2015-05-29 11:36:59 +09:00
Colin Patrick Mccabe b9752f24a6 HDFS-8407. libhdfs hdfsListDirectory must set errno to 0 on success (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit d2d95bfe88)
2015-05-28 11:38:44 -07:00
cnauroth 25db341278 HDFS-8431. hdfs crypto class not found in Windows. Contributed by Anu Engineer.
(cherry picked from commit 50eeea1300)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd
2015-05-27 22:56:04 -07:00
Andrew Wang a634809895 HDFS-8482. Rename BlockInfoContiguous to BlockInfo. Contributed by Zhe Zhang.
(cherry picked from commit ff83459f192f7cc4ce864f0b1f01e1e08243be83)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java
2015-05-27 15:42:12 -07:00
Haohui Mai cc348fead7 Revert HDFS-8135 in branch-2. 2015-05-27 11:06:17 -07:00
Haohui Mai f70b9d9241 HDFS-8377. Support HTTP/2 in datanode. Contributed by Duo Zhang. 2015-05-24 22:30:50 -07:00
Vinayakumar B 658f5cf985 HDFS-8268. Port conflict log for data node server is not sufficient (Contributed by Mohammad Shahid Khan)
(cherry picked from commit 0c6638c2ea)
2015-05-22 16:15:39 +05:30
Arpit Agarwal a073e5bd31 HDFS-8454. Remove unnecessary throttling in TestDatanodeDeath. (Arpit Agarwal) 2015-05-21 20:44:07 -07:00
Xiaoyu Yao 61d7ccb27e HDFS-8451. DFSClient probe for encryption testing interprets empty URI property for enabled. Contributed by Steve Loughran.
(cherry picked from commit 05e04f34f2)
2015-05-21 11:59:11 -07:00
Haohui Mai 0b909d028f HDFS-8421. Move startFile() and related functions into FSDirWriteFileOp. Contributed by Haohui Mai. 2015-05-21 08:06:13 -07:00
Akira Ajisaka 185cddfd6a HDFS-4383. Document the lease limits. Contributed by Arshad Mohammad.
(cherry picked from commit dc8434ab2b)
2015-05-21 17:31:47 +09:00
Kihwal Lee 536b9ee6d6 HDFS-8404. Pending block replication can get stuck using older genstamp. Contributed by Nathan Roberts.
(cherry picked from commit 8860e352c3)
2015-05-19 13:06:48 -05:00
Kihwal Lee 9e656bfa94 HDFS-8131. Implement a space balanced block placement policy. Contributed by Liu Shaohui.
(cherry picked from commit de30d66b26)
2015-05-19 08:06:07 -05:00
Vinayakumar B 6dee42f6db HDFS-6348. SecondaryNameNode not terminating properly on runtime exceptions (Contributed by Rakesh R)
(cherry picked from commit 93972a332a)
2015-05-19 12:25:00 +05:30
Ravi Prakash e5b805d361 HDFS-4185. Add a metric for number of active leases (Rakesh R via raviprak)
(cherry picked from commit cdfae446ad)
2015-05-18 12:38:32 -07:00
Tsz-Wo Nicholas Sze 7bd4db968d HDFS-8405. Fix a typo in NamenodeFsck. Contributed by Takanobu Asanuma 2015-05-19 03:01:07 +08:00
Arpit Agarwal 9bcb740049 HDFS-8345. Storage policy APIs must be exposed via the FileSystem interface. (Arpit Agarwal) 2015-05-18 11:49:01 -07:00
Uma Maheswara Rao G ea875939f1 Revert from branch-2: HDFS-8332. DFS client API calls should check filesystem closed. Contributed by Rakesh R. 2015-05-18 14:38:30 +05:30
Arpit Agarwal 151f6d6dcc HDFS-8157. Writes to RAM DISK reserve locked memory for block files. (Arpit Agarwal) 2015-05-16 09:05:50 -07:00
Haohui Mai 46d62e7016 HDFS-8403. Eliminate retries in TestFileCreation#testOverwriteOpenForWrite. Contributed by Arpit Agarwal. 2015-05-15 19:12:46 -07:00
Haohui Mai 1796d94d62 HDFS-8394. Move getAdditionalBlock() and related functionalities into a separate class. Contributed by Haohui Mai. 2015-05-15 19:10:05 -07:00
Jing Zhao d6aa65d037 HDFS-8397. Refactor the error handling code in DataStreamer. Contributed by Tsz Wo Nicholas Sze.
(cherry picked from commit 8f37873342)
2015-05-15 16:32:25 -07:00
Vinayakumar B d9455c790f HDFS-6888. Allow selectively audit logging ops (Contributed by Chen He)
(cherry picked from commit 7f2e89fa7082840bfa3e8e593c93db050a80d04f)
2015-05-15 11:05:26 +05:30
Akira Ajisaka 7fb3486eb3 HDFS-8350. Remove old webhdfs.xml and other outdated documentation stuff. Contributed by Brahma Reddy Battula. 2015-05-15 13:57:58 +09:00
Akira Ajisaka 2e5b7f24ab HDFS-8371. Fix test failure in TestHdfsConfigFields for spanreceiver properties. Contributed by Ray Chiang.
(cherry picked from commit cbc01ed08e)
2015-05-15 12:15:26 +09:00
Vinayakumar B 4bbcffa510 HDFS-8150. Make getFileChecksum fail for blocks under construction (Contributed by J.Andreina)
(cherry picked from commit def9136e02)
2015-05-14 15:55:20 +05:30
Haohui Mai 4b5915be9f HDFS-7728. Avoid updating quota usage while loading edits. Contributed by Jing Zhao. 2015-05-13 21:50:41 -07:00
Arpit Agarwal 33f6136ee3 HDFS-8243. Files written by TestHostsFiles and TestNameNodeMXBean are causing Release Audit Warnings. (Contributed by Ruth Wisniewski) 2015-05-13 19:46:34 -07:00
Colin Patrick Mccabe 52da75180a HDFS-8380. Always call addStoredBlock on blocks which have been shifted from one storage to another (cmccabe)
(cherry picked from commit 281d47a969)
2015-05-13 14:45:37 -07:00
Kihwal Lee 2e9392c157 HDFS-8358. TestTraceAdmin fails. Contributed by Masatake Iwasaki.
(cherry picked from commit f9a46a00d2)
2015-05-13 14:16:37 -05:00
Vinayakumar B 2adb1257b1 HDFS-6300. Prevent multiple balancers from running simultaneously (Contributed by Rakesh R)
(cherry picked from commit 065d8f2a34)
2015-05-13 17:30:40 +05:30
Akira Ajisaka 7596c6e731 HDFS-6184. Capture NN's thread dump when it fails over. Contributed by Ming Ma.
(cherry picked from commit 2463666ecb)
2015-05-13 11:37:59 +09:00
yliu c31c6fbda7 HDFS-8255. Rename getBlockReplication to getPreferredBlockReplication. (Contributed by Zhe Zhang) 2015-05-12 21:26:57 +08:00
Vinayakumar B e1b8bb9d84 HDFS-8362. Java Compilation Error in TestHdfsConfigFields.java (Contributed by Arshad Mohammad)
(cherry picked from commit 987abc99b0)
2015-05-12 12:10:14 +05:30
Kihwal Lee 50778f9d45 HDFS-7916. 'reportBadBlocks' from datanodes to standby Node BPServiceActor goes for infinite loop. Contributed by Rushabh Shah.
(cherry picked from commit ea11590aad)
2015-05-11 14:33:45 -05:00
Akira Ajisaka 703f1e9d16 HDFS-8351. Remove namenode -finalize option from document. (aajisaka)
(cherry picked from commit 3fa2efc09f)
2015-05-11 15:37:12 +09:00
Haohui Mai 1f499a61dc HDFS-8357. Consolidate parameters of INode.CleanSubtree() into a parameter objects. Contributed by Li Lu. 2015-05-09 22:52:07 -07:00
Haohui Mai 300d36cee7 HDFS-8327. Compute storage type quotas in INodeFile.computeQuotaDeltaForTruncate(). Contributed by Haohui Mai. 2015-05-08 23:09:57 -07:00
Haohui Mai 51bfb66ec8 Add missing entry in CHANGES.txt for HDFS-6757. 2015-05-08 23:09:55 -07:00
Arpit Agarwal 969a8f6c96 HDFS-8097. TestFileTruncate is failing intermittently. (Contributed by Rakesh R) 2015-05-08 16:29:01 -07:00
Kihwal Lee f264a5aeed 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 2d4ae3d18b)
2015-05-08 16:37:26 -05:00
Colin Patrick Mccabe ab80a572be HDFS-8113. Add check for null BlockCollection pointers in BlockInfoContiguous structures (Chengbing Liu via Colin P. McCabe)
(cherry picked from commit f523e963e4)
2015-05-08 14:00:13 -07:00
Yongjun Zhang fbb2cf54bc HDFS-8311. DataStreamer.transfer() should timeout the socket InputStream. (Esteban Gutierrez via Yongjun Zhang)
(cherry picked from commit 730f9930a4)
2015-05-08 01:38:01 -07:00
Kihwal Lee 30cb540b4d HDFS-7433. Optimize performance of DatanodeManager's node map. Contributed by Daryn Sharp.
(cherry picked from commit 7a7960be41)
2015-05-08 15:20:14 -05:00
Colin Patrick Mccabe d83ae68bb0 HDFS-8284. Update documentation about how to use HTrace with HDFS (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit 8f7c2364d7)
2015-05-08 12:30:34 -07:00
cnauroth 5c188908fe HDFS-5640. Add snapshot methods to FileContext. Contributed by Rakesh R.
(cherry picked from commit 26f61d41df)
2015-05-08 11:21:02 -07:00
Arun Suresh 2124742e07 HDFS-7559. Create unit test to automatically compare HDFS related classes and hdfs-default.xml. (Ray Chiang via asuresh)
(cherry picked from commit 3cefc02af7)
2015-05-08 10:31:23 -07:00
Arpit Agarwal 68d85e92bf HDFS-8340. Fix NFS documentation of nfs.wtmax. (Contributed by Ajith S) 2015-05-08 10:15:35 -07:00
Arpit Agarwal a0905ae57a HDFS-8274. NFS configuration nfs.dump.dir not working (Contributed by Ajith S) 2015-05-08 10:04:11 -07:00
Haohui Mai d4d7d7bf22 HDFS-8346. libwebhdfs build fails during link due to unresolved external symbols. Contributed by Chris Nauroth. 2015-05-08 09:58:00 -07:00
Kihwal Lee 802a5775f3 HDFS-7894. Rolling upgrade readiness is not updated in jmx until query command is issued. Contributed by Brahma Reddy Battula.
(cherry picked from commit 6f622672b6)
2015-05-08 09:32:07 -05:00
Uma Maheswara Rao G faf26f081c HDFS-6285. tidy an error log inside BlockReceiver. Contributed by Liang Xie.
(cherry picked from commit 7b1ea9c481)
2015-05-08 17:25:07 +05:30
Vinayakumar B d129bbbb37 HDFS-3384. DataStreamer thread should be closed immediatly when failed to setup a PipelineForAppendOrRecovery (Contributed by Uma Maheswara Rao G)
(cherry picked from commit c648317a68)
2015-05-08 17:18:59 +05:30
Vinayakumar B a87ab77fec HDFS-6576. Datanode log is generating at root directory in security mode (Contributed by surendra singh lilhore) 2015-05-08 16:37:36 +05:30
Vinayakumar B 3a894b4563 HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina)
(cherry picked from commit e01c1a979c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
	hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
2015-05-08 15:34:17 +05:30
Vinayakumar B eaa5f3e448 HDFS-8209. Support different number of datanode directories in MiniDFSCluster. (Contributed by surendra singh lilhore)
(cherry picked from commit 4c6816faf8)
2015-05-08 15:04:58 +05:30
Tsuyoshi Ozawa 8109f29ee2 HDFS-8207. Improper log message when blockreport interval compared with initial delay. Contributed by Brahma Reddy Battula and Ashish Singhi.
(cherry picked from commit 888e630990)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-05-08 18:14:08 +09:00
Vinayakumar B 595b92e2c2 HDFS-8175. Provide information on snapshotDiff for supporting the comparison between snapshot and current status (Contributed by J.Andreina)
(cherry picked from commit 6232235df3)
2015-05-08 14:38:53 +05:30
Vinayakumar B 10999ffd7a HDFS-8187. Remove usage of '-setStoragePolicy' and '-getStoragePolicy' using dfsadmin cmd (as it is not been supported) (Contributed by J.Andreina)
(cherry picked from commit e642eff0e0)
2015-05-08 14:26:58 +05:30
Uma Maheswara Rao G a56f57b421 HDFS-8108. Fsck should provide the info on mandatory option to be used along with -blocks ,-locations and -racks. Contributed by J.Andreina.
(cherry picked from commit 4b00ae5c11)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
2015-05-08 14:23:42 +05:30
Akira Ajisaka 143c9a8ff2 HDFS-8222. Remove usage of "dfsadmin -upgradeProgress" from document which is no longer supported. Contributed by J.Andreina.
(cherry picked from commit fd605997ee)
2015-05-08 17:23:25 +09:00