Commit 99ec6f0
committed
Merge branch 'master' of https://github.com/apache/ozone into rocksdb-v10-upgrade
Conflicts:
pom.xml577 files changed
Lines changed: 27312 additions & 13096 deletions
File tree
- .github
- comment-commands
- workflows
- dev-support
- ci
- pmd
- hadoop-hdds
- cli-common
- src/main/java/org/apache/hadoop/hdds/cli
- client/src
- main/java/org/apache/hadoop/hdds/scm
- client
- storage
- test/java/org/apache/hadoop
- hdds/scm/storage
- ozone/client/io
- common
- src
- main
- java/org/apache/hadoop
- hdds
- client
- conf
- protocol
- scm
- container
- balancer
- pipeline
- security
- tracing
- utils
- db
- io
- ozone
- common
- container/common/helpers
- resources
- test/java/org/apache/hadoop/hdds
- tracing
- utils/io
- config
- src/main/java/org/apache/hadoop/hdds/conf
- container-service/src
- main/java/org/apache/hadoop/ozone
- container
- common
- impl
- statemachine
- states/endpoint
- transport/server/ratis
- volume
- diskbalancer
- policy
- ec/reconstruction
- keyvalue/impl
- metadata
- ozoneimpl
- upgrade
- protocol/commands
- test/java/org/apache/hadoop/ozone/container
- common
- impl
- volume
- diskbalancer
- keyvalue/impl
- ozoneimpl
- upgrade
- docs/content
- design
- feature
- erasurecode/src/test/java/org/apache/ozone/erasurecode
- framework
- src
- main/java/org/apache/hadoop
- hdds
- conf
- scm
- client
- ha
- net
- protocolPB
- protocol
- security
- symmetric
- x509/certificate/authority
- server
- http
- utils
- db
- ozone/common
- test/java/org/apache/hadoop/hdds
- scm/net
- utils/db
- interface-admin/src/main/proto
- interface-client/src/main/proto
- managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed
- server-scm/src
- main/java/org/apache/hadoop
- hdds/scm
- block
- container
- balancer
- replication
- health
- states
- ha
- invoker
- io
- node
- pipeline
- protocol
- security
- server
- upgrade
- ozone/audit
- test
- java/org/apache/hadoop
- hdds/scm
- container
- balancer
- replication
- health
- states
- ha
- io
- node
- server
- ozone/container/common
- resources/replicationManagerTests
- test-utils/src/main/java/org/apache/ozone/test
- hadoop-ozone
- cli-admin
- src
- main/java/org/apache/hadoop
- hdds/scm/cli
- container
- datanode
- ozone/admin
- nssummary
- om
- test/java/org/apache/hadoop/hdds/scm/cli
- container
- datanode
- cli-debug
- src/main/java/org/apache/hadoop/ozone/debug/audit/parser
- common
- handler
- cli-repair
- src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade
- cli-shell
- src/main/java/org/apache/hadoop/ozone/shell
- acl
- bucket
- common
- keys
- prefix
- snapshot
- tenant
- volume
- client/src/main/java/org/apache/hadoop/ozone/client
- io
- protocol
- rpc
- common/src
- main/java/org/apache/hadoop/ozone
- om
- exceptions
- ha
- helpers
- protocolPB
- util
- test/java/org/apache/hadoop/ozone/om/helpers
- dist
- src
- main
- compose
- common
- ozone-balancer
- ozone-om-ha
- ozone-topology
- ozonesecure-ha
- ozone
- restart
- upgrade/compose
- ha
- non-ha
- k8s/examples
- license
- bin
- smoketest
- cli
- s3
- shell/ozone
- fault-injection-test
- mini-chaos-tests
- network-tests/src/test/compose
- freon
- src/main/java/org/apache/hadoop/ozone/freon
- httpfsgateway
- iceberg
- dev-support
- src/main/java/org/apache/hadoop/ozone/iceberg
- integration-test-recon
- src/test/java/org/apache/hadoop/ozone/recon
- integration-test-s3
- src/test
- java/org/apache/hadoop/ozone/s3/awssdk
- v1
- v2
- resources
- integration-test
- src/test
- java/org/apache
- hadoop
- conf
- fs
- contract
- ozone
- hdds/scm
- container/replication
- ozone
- client/rpc
- om
- snapshot
- reconfig
- scm/node
- tools/contract
- ozone/test
- resources
- interface-client/src/main/proto
- interface-storage/src/main/java/org/apache/hadoop/ozone/om
- multitenancy-ranger
- ozone-manager
- src
- main/java/org/apache/hadoop/ozone
- om
- codec
- ha
- ratis
- request
- bucket
- file
- key
- snapshot
- upgrade
- volume
- service
- snapshot
- protocolPB
- security/acl
- test/java/org/apache/hadoop/ozone
- om
- ratis_snapshot
- ratis
- request
- bucket
- file
- key
- snapshot
- validation
- service
- snapshot
- security/acl
- ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone
- ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone
- ozonefs-shaded
- recon-codegen/src/main/java/org/apache/ozone/recon
- codegen
- schema
- recon
- src
- main
- java/org/apache/hadoop/ozone/recon
- api
- filters
- types
- fsck
- metrics
- persistence
- scm
- spi
- impl
- tasks
- upgrade
- resources/webapps/recon/ozone-recon-web
- api
- src
- __tests__/mocks/capacityMocks
- v2
- components
- plots
- select
- tables
- constants
- pages
- buckets
- capacity
- insights
- types
- views/insights
- test/java/org/apache/hadoop/ozone/recon
- api
- filters
- fsck
- heatmap
- metrics
- persistence
- scm
- tasks
- upgrade
- s3gateway/src
- main/java/org/apache/hadoop/ozone
- s3secret
- s3
- endpoint
- exception
- signature
- util
- test/java/org/apache/hadoop/ozone
- client
- s3
- endpoint
- exception
- metrics
- signature
- tools
- vapor
- dev-support
- src
- main/java/org/apache/hadoop/ozone/freon
- containergenerator
- test/java/org/apache/hadoop/ozone/freon/containergenerator
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | 79 | | |
87 | 80 | | |
88 | 81 | | |
| |||
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
26 | 28 | | |
27 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
25 | 28 | | |
26 | 29 | | |
27 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
80 | | - | |
| 80 | + | |
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
| 98 | + | |
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
115 | | - | |
| 115 | + | |
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
126 | | - | |
| 126 | + | |
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
| |||
0 commit comments