From e918fff3f2bc08fe91a6d5b2758704045333d7f6 Mon Sep 17 00:00:00 2001 From: zhangpengyang Date: Thu, 3 Sep 2026 09:56:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?hadoop=203.3.4=E6=BC=8F=E6=B4=9E=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hadoop-client-runtime/pom.xml | 8 +++++ hadoop-common-project/hadoop-common/pom.xml | 5 +++ .../apache/hadoop/security/SecurityUtil.java | 2 +- .../apache/hadoop/ha/ClientBaseWithFixes.java | 11 +++--- .../ha/TestZKFailoverControllerStress.java | 2 +- .../avro/TestAvroSerialization.java | 2 +- .../registry/server/dns/RegistryDNS.java | 34 +++++++------------ .../registry/server/dns/SecureableZone.java | 2 +- .../services/MicroZookeeperService.java | 2 +- .../registry/server/dns/TestRegistryDNS.java | 8 ++--- .../jobhistory/JobQueueChangeEvent.java | 10 +++--- hadoop-project/pom.xml | 12 +++---- .../apache/hadoop/tools/rumen/JobBuilder.java | 16 ++++----- .../hadoop/tools/rumen/JobHistoryUtils.java | 6 ++-- .../apache/hadoop/tools/rumen/LoggedTask.java | 8 ++--- .../hadoop/tools/rumen/LoggedTaskAttempt.java | 8 ++--- .../pom.xml | 8 +++++ pom.xml | 1 + 18 files changed, 81 insertions(+), 64 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index e26986d4aebf0b..e7ba411ef0bc8c 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -165,6 +165,7 @@ org.xerial.snappy:* + true @@ -179,6 +180,13 @@ *:* **/*.java + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + META-INF/versions/** + + META-INF/services/java.net.spi.InetAddressResolverProvider diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 530e18e4b83613..3cac464c1c5dc6 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -372,6 +372,11 @@ lz4-java provided + diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java index 3b9e9c53e44f40..1bba3ad1086038 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java @@ -608,7 +608,7 @@ protected static class QualifiedHostResolver implements HostResolver { private List searchDomains = new ArrayList<>(); { ResolverConfig resolverConfig = ResolverConfig.getCurrentConfig(); - Name[] names = resolverConfig.searchPath(); + List names = resolverConfig.searchPath(); if (names != null) { for (Name name : names) { searchDomains.add(name.toString()); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java index 666000b2f48ae7..775919b4d455f1 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java @@ -41,7 +41,6 @@ import org.apache.zookeeper.ZKTestCase; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.server.ServerCnxnFactory; -import org.apache.zookeeper.server.ServerCnxnFactoryAccessor; import org.apache.zookeeper.server.ZKDatabase; import org.apache.zookeeper.server.ZooKeeperServer; import org.apache.zookeeper.server.persistence.FileTxnLog; @@ -437,9 +436,13 @@ protected void stopServer() throws Exception { protected static ZooKeeperServer getServer(ServerCnxnFactory fac) { - ZooKeeperServer zs = ServerCnxnFactoryAccessor.getZkServer(fac); - - return zs; + try { + java.lang.reflect.Field f = ServerCnxnFactory.class.getDeclaredField("zkServer"); + f.setAccessible(true); + return (ZooKeeperServer) f.get(fac); + } catch (Exception e) { + throw new RuntimeException("Failed to get ZooKeeperServer from ServerCnxnFactory", e); + } } protected void tearDownAll() throws Exception { diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java index bdbf1d9c2c286e..dd6de42b0c7b45 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java @@ -131,7 +131,7 @@ public void testRandomHealthAndDisconnects() throws Exception { long st = Time.now(); while (Time.now() - st < runFor) { cluster.getTestContext().checkException(); - serverFactory.closeAll(); + serverFactory.closeAll(org.apache.zookeeper.server.ServerCnxn.DisconnectReason.CLEAN_UP); Thread.sleep(50); } } diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java index b2d2a8d100ff15..97e281ba85ea2e 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java @@ -33,7 +33,7 @@ public class TestAvroSerialization { @Test public void testSpecific() throws Exception { AvroRecord before = new AvroRecord(); - before.intField = 5; + before.setIntField(5); AvroRecord after = SerializationTestUtil.testSerialization(conf, before); assertEquals(before, after); } diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java index eeee5815409636..4302df4b775ce4 100644 --- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java +++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java @@ -233,13 +233,8 @@ private void updateDNSServer(Configuration conf) { } ResolverConfig.refresh(); ExtendedResolver resolver; - try { resolver = new ExtendedResolver(); - } catch (UnknownHostException e) { - LOG.error("Can not resolve DNS servers: ", e); - return; - } - for (Resolver check : resolver.getResolvers()) { + for (Resolver check : resolver.getResolvers()) { if (check instanceof SimpleResolver) { InetAddress address = ((SimpleResolver) check).getAddress() .getAddress(); @@ -260,9 +255,9 @@ private void updateDNSServer(Configuration conf) { } StringBuilder message = new StringBuilder(); message.append("DNS servers: "); - if (ResolverConfig.getCurrentConfig().servers() != null) { - for (String server : ResolverConfig.getCurrentConfig() - .servers()) { + List servers = ResolverConfig.getCurrentConfig().servers(); + if (servers != null) { + for (InetSocketAddress server : servers) { message.append(server); message.append(" "); } @@ -334,8 +329,8 @@ private void signZones() throws IOException { Iterator itor = zone.iterator(); while (itor.hasNext()) { RRset rRset = (RRset) itor.next(); - Iterator sigs = rRset.sigs(); - if (!sigs.hasNext()) { + List sigs = rRset.sigs(); + if (!sigs.isEmpty()) { try { signSiteRecord(zone, rRset.first()); } catch (DNSSEC.DNSSECException e) { @@ -1403,11 +1398,10 @@ byte addAnswer(Message response, Name name, int type, int dclass, response.getHeader().setFlag(Flags.AA); } } else if (sr.isSuccessful()) { - RRset[] rrsets = sr.answers(); + List rrsets = sr.answers(); LOG.info("found answers {}", rrsets); - for (int i = 0; i < rrsets.length; i++) { - addRRset(name, response, rrsets[i], - Section.ANSWER, flags); + for (int i = 0; i < rrsets.size(); i++) { + addRRset(name, response, rrsets.get(i), Section.ANSWER, flags); } addNS(response, zone, flags); if (iterations == 0) { @@ -1515,9 +1509,8 @@ private void addRRset(Name name, Message response, RRset rrset, int section, } } if ((flags & FLAG_SIGONLY) == 0) { - Iterator it = rrset.rrs(); - while (it.hasNext()) { - Record r = (Record) it.next(); + List records = rrset.rrs(); + for (Record r : records) { // foreach 遍历 if (r.getName().isWild() && !name.isWild()) { r = r.withName(name); } @@ -1525,9 +1518,8 @@ private void addRRset(Name name, Message response, RRset rrset, int section, } } if ((flags & (FLAG_SIGONLY | FLAG_DNSSECOK)) != 0) { - Iterator it = rrset.sigs(); - while (it.hasNext()) { - Record r = (Record) it.next(); + List sigs = rrset.sigs(); + for (Record r : sigs) { // foreach 遍历 if (r.getName().isWild() && !name.isWild()) { r = r.withName(name); } diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/SecureableZone.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/SecureableZone.java index 4b0a85269d3cd8..9da7dd927f396f 100644 --- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/SecureableZone.java +++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/SecureableZone.java @@ -138,7 +138,7 @@ public Record getNXTRecord(Record queryRecord, Zone zone) { SetResponse sr = zone.findRecords(base.getName(), Type.ANY); BitSet bitMap = new BitSet(); bitMap.set(Type.NXT); - RRset[] rRsets = sr.answers(); + List rRsets = sr.answers(); for (RRset rRset : rRsets) { int typeCode = rRset.getType(); if (typeCode > 0 && typeCode < 128) { diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java index 0ab4cd2f3bfacd..ea469837212ed5 100644 --- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java +++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java @@ -229,7 +229,7 @@ protected void serviceStart() throws Exception { setupSecurity(); FileTxnSnapLog ftxn = new FileTxnSnapLog(dataDir, dataDir); - ZooKeeperServer zkServer = new ZooKeeperServer(ftxn, tickTime); + ZooKeeperServer zkServer = new ZooKeeperServer(); LOG.info("Starting Local Zookeeper service"); factory = ServerCnxnFactory.createFactory(); diff --git a/hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java b/hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java index a0c4ca3970c5c1..a57a6be8d9d58d 100644 --- a/hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java +++ b/hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java @@ -344,7 +344,7 @@ public void testMissingReverseLookup() throws Exception { Name name = Name.fromString("19.1.17.172.in-addr.arpa."); Record question = Record.newRecord(name, Type.PTR, DClass.IN); Message query = Message.newQuery(question); - OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null); + OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, new EDNSOption[0]); query.addRecord(optRecord, Section.ADDITIONAL); byte[] responseBytes = getRegistryDNS().generateReply(query, null); Message response = new Message(responseBytes); @@ -386,7 +386,7 @@ Record[] assertDNSQuery(String lookup, int type, int numRecs) Name name = Name.fromString(lookup); Record question = Record.newRecord(name, type, DClass.IN); Message query = Message.newQuery(question); - OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null); + OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, new EDNSOption[0]); query.addRecord(optRecord, Section.ADDITIONAL); byte[] responseBytes = getRegistryDNS().generateReply(query, null); Message response = new Message(responseBytes); @@ -415,7 +415,7 @@ Record[] assertDNSQueryNotNull(String lookup, int type, int answerCount) Name name = Name.fromString(lookup); Record question = Record.newRecord(name, type, DClass.IN); Message query = Message.newQuery(question); - OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null); + OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, new EDNSOption[0]); query.addRecord(optRecord, Section.ADDITIONAL); byte[] responseBytes = getRegistryDNS().generateReply(query, null); Message response = new Message(responseBytes); @@ -588,7 +588,7 @@ public void testReadMasterFile() throws Exception { Name name = Name.fromString("5.0.17.172.in-addr.arpa."); Record question = Record.newRecord(name, Type.PTR, DClass.IN); Message query = Message.newQuery(question); - OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null); + OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, new EDNSOption[0]); query.addRecord(optRecord, Section.ADDITIONAL); byte[] responseBytes = getRegistryDNS().generateReply(query, null); Message response = new Message(responseBytes); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java index 66f378123986d3..aa70bbff62490a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java @@ -31,8 +31,8 @@ public class JobQueueChangeEvent implements HistoryEvent { private JobQueueChange datum = new JobQueueChange(); public JobQueueChangeEvent(JobID id, String queueName) { - datum.jobid = new Utf8(id.toString()); - datum.jobQueueName = new Utf8(queueName); + datum.setJobid(new Utf8(id.toString())); + datum.setJobQueueName(new Utf8(queueName)); } JobQueueChangeEvent() { } @@ -54,13 +54,13 @@ public void setDatum(Object datum) { /** Get the Job ID */ public JobID getJobId() { - return JobID.forName(datum.jobid.toString()); + return JobID.forName(datum.getJobid().toString()); } /** Get the new Job queue name */ public String getJobQueueName() { - if (datum.jobQueueName != null) { - return datum.jobQueueName.toString(); + if (datum.getJobQueueName() != null) { + return datum.getJobQueueName().toString(); } return null; } diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 0b2f6f17157d73..5646d3c5f49bb8 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -63,7 +63,7 @@ file:///dev/urandom - 1.7.7 + 1.11.4 1.19 @@ -97,10 +97,10 @@ ${hadoop-thirdparty-shaded-prefix}.protobuf ${hadoop-thirdparty-shaded-prefix}.com.google.common - 3.5.6 + 3.7.2 4.2.0 3.0.5 - 2.1.7 + 3.6.0 27.0-jre 4.0 @@ -113,7 +113,7 @@ 1.0.0-M33 - 1.9.4 + 1.11.0 1.2 1.15 3.2.2 @@ -127,7 +127,7 @@ 3.6 1.4 - 1.0.1 + 2.1.2 1.0-alpha-1 3.3.1 2.4.12 @@ -141,7 +141,7 @@ 2.8.9 3.2.4 3.10.6.Final - 4.1.77.Final + 4.1.118.Final 1.1.8.2 1.7.1 diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java index 1213e6a46f4492..603b248f6e848b 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java @@ -460,7 +460,7 @@ private void processTaskFinishedEvent(TaskFinishedEvent event) { } task.setFinishTime(event.getFinishTime()); task.setTaskStatus(getPre21Value(event.getTaskStatus())); - task.incorporateCounters(((TaskFinished) event.getDatum()).counters); + task.incorporateCounters(((TaskFinished) event.getDatum()).getCounters()); } private void processTaskFailedEvent(TaskFailedEvent event) { @@ -472,7 +472,7 @@ private void processTaskFailedEvent(TaskFailedEvent event) { task.setFinishTime(event.getFinishTime()); task.setTaskStatus(getPre21Value(event.getTaskStatus())); TaskFailed t = (TaskFailed)(event.getDatum()); - task.putDiagnosticInfo(t.error.toString()); + task.putDiagnosticInfo(t.getError().toString()); // killed task wouldn't have failed attempt. if (t.getFailedDueToAttempt() != null) { task.putFailedDueToAttemptId(t.getFailedDueToAttempt().toString()); @@ -542,7 +542,7 @@ private void processTaskAttemptFinishedEvent(TaskAttemptFinishedEvent event) { } attempt.setFinishTime(event.getFinishTime()); attempt - .incorporateCounters(((TaskAttemptFinished) event.getDatum()).counters); + .incorporateCounters(((TaskAttemptFinished) event.getDatum()).getCounters()); } private void processReduceAttemptFinishedEvent( @@ -568,7 +568,7 @@ private void processReduceAttemptFinishedEvent( attempt.setShuffleFinished(event.getShuffleFinishTime()); attempt.setSortFinished(event.getSortFinishTime()); attempt - .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).counters); + .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).getCounters()); attempt.arraySetClockSplits(event.getClockSplits()); attempt.arraySetCpuUsages(event.getCpuUsages()); attempt.arraySetVMemKbytes(event.getVMemKbytes()); @@ -596,7 +596,7 @@ private void processMapAttemptFinishedEvent(MapAttemptFinishedEvent event) { // is redundant, but making this will add future-proofing. attempt.setFinishTime(event.getFinishTime()); attempt - .incorporateCounters(((MapAttemptFinished) event.getDatum()).counters); + .incorporateCounters(((MapAttemptFinished) event.getDatum()).getCounters()); attempt.arraySetClockSplits(event.getClockSplits()); attempt.arraySetCpuUsages(event.getCpuUsages()); attempt.arraySetVMemKbytes(event.getVMemKbytes()); @@ -661,11 +661,11 @@ private void processJobFinishedEvent(JobFinishedEvent event) { JobFinished job = (JobFinished)event.getDatum(); Map countersMap = - JobHistoryUtils.extractCounters(job.totalCounters); + JobHistoryUtils.extractCounters(job.getTotalCounters()); result.putTotalCounters(countersMap); - countersMap = JobHistoryUtils.extractCounters(job.mapCounters); + countersMap = JobHistoryUtils.extractCounters(job.getMapCounters()); result.putMapCounters(countersMap); - countersMap = JobHistoryUtils.extractCounters(job.reduceCounters); + countersMap = JobHistoryUtils.extractCounters(job.getReduceCounters()); result.putReduceCounters(countersMap); } diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java index 6ae87bbd40a110..34ef95f3378588 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java @@ -157,9 +157,9 @@ static boolean isJobConfXml(String fileName) { static Map extractCounters(JhCounters counters) { Map countersMap = new HashMap(); if (counters != null) { - for (JhCounterGroup group : counters.groups) { - for (JhCounter counter : group.counts) { - countersMap.put(counter.name.toString(), counter.value); + for (JhCounterGroup group : counters.getGroups()) { + for (JhCounter counter : group.getCounts()) { + countersMap.put(counter.getName().toString(), counter.getValue()); } } } diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java index 4ae33a76617fb4..2308e586900bb4 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java @@ -268,11 +268,11 @@ private static void incorporateCounter(SetField thunk, JhCounters counters, String counterName) { counterName = canonicalizeCounterName(counterName); - for (JhCounterGroup group : counters.groups) { - for (JhCounter counter : group.counts) { + for (JhCounterGroup group : counters.getGroups()) { + for (JhCounter counter : group.getCounts()) { if (counterName - .equals(canonicalizeCounterName(counter.name.toString()))) { - thunk.set(counter.value); + .equals(canonicalizeCounterName(counter.getName().toString()))) { + thunk.set(counter.getValue()); return; } } diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java index 5c6abd372c081c..c4ca962b6e69f1 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java @@ -636,11 +636,11 @@ private static void incorporateCounter(SetField thunk, JhCounters counters, String counterName) { counterName = canonicalizeCounterName(counterName); - for (JhCounterGroup group : counters.groups) { - for (JhCounter counter : group.counts) { + for (JhCounterGroup group : counters.getGroups()) { + for (JhCounter counter : group.getCounts()) { if (counterName - .equals(canonicalizeCounterName(counter.name.toString()))) { - thunk.set(counter.value); + .equals(canonicalizeCounterName(counter.getName().toString()))) { + thunk.set(counter.getValue()); return; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml index 8d3b106547bd7e..c0f56c8604f4bb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml @@ -37,6 +37,7 @@ UTF-8 false *Spec + true @@ -267,6 +268,7 @@ frontend-maven-plugin target + ${frontend.skip} @@ -455,6 +457,12 @@ + + skip-frontend + + true + + parallel-tests diff --git a/pom.xml b/pom.xml index f4e435c749398a..c6cf2fb84225e3 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x bash org.fusesource.leveldbjni + true From 93bba46405b2bd32db72d4397267a8f4869f1b82 Mon Sep 17 00:00:00 2001 From: zhangpengyang Date: Thu, 3 Sep 2026 10:16:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?hadoop=203.3.4=E6=BC=8F=E6=B4=9E=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.txt | 17 +++++++++++++++++ .../registry/server/dns/TestRegistryDNS.java | 1 + 2 files changed, 18 insertions(+) diff --git a/README.txt b/README.txt index 8d37cc92a7ecbe..240f8dbeea5bd7 100644 --- a/README.txt +++ b/README.txt @@ -5,3 +5,20 @@ For the latest information about Hadoop, please visit our website at: and our wiki, at: https://cwiki.apache.org/confluence/display/HADOOP/ +----------------------------------------------------------------------------------- +dnsjava:dnsjava 2.1.7 ->3.6.0 已完成 +----------------------------------------------------------------------------------- +org.eclipse.jetty:jetty-servlets 9.4.44.V20210927 ->9.4.54 +----------------------------------------------------------------------------------- +io.netty:netty-handler 4.1.101.Final ->4.1.118.Final 已完成 +----------------------------------------------------------------------------------- +org.apache.kerby:kerber-server 1.0.1 ->2.1.2 已完成 +----------------------------------------------------------------------------------- +org.apache.avro:avro 1.7.7 ->1.11.4 已完成 +----------------------------------------------------------------------------------- +commons-beanutils:commons-beanutils 1.9.4 ->1.11.0 已完成 +----------------------------------------------------------------------------------- +org.jboss.xnio:xnio-api 3.8.7.Final ->3.8.14 +----------------------------------------------------------------------------------- +org.eclipse.jetty:jetty-server 9.4.53.V20231009 ->12.0.38 +----------------------------------------------------------------------------------- \ No newline at end of file diff --git a/hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java b/hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java index a57a6be8d9d58d..227ff0d4c1f48e 100644 --- a/hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java +++ b/hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java @@ -31,6 +31,7 @@ import org.xbill.DNS.DClass; import org.xbill.DNS.DNSKEYRecord; import org.xbill.DNS.DNSSEC; +import org.xbill.DNS.EDNSOption; import org.xbill.DNS.Flags; import org.xbill.DNS.Message; import org.xbill.DNS.Name;