Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port CDM updates to 2.26.x branch #6434

Merged
merged 7 commits into from
Dec 8, 2020
Merged

Port CDM updates to 2.26.x branch #6434

merged 7 commits into from
Dec 8, 2020

Conversation

aaronilovici
Copy link
Contributor

What does this PR do?

This PR includes the following:

This was tested with Zookeeper 3.5.7, ddf-solr 2.26.0, with DDF simple search.

Who is reviewing it?

@jhunzik
@figliold
@clockard

Select relevant component teams:

Ask 2 committers to review/merge the PR and tag them here.

@clockard
@figliold

How should this be tested?

  • Build this branch, install and configure DDF
  • Create a CDM and verify ingest
  • Create a file larger than max file size to ingest and verify log
  • Create a timeout too small to ingest a large file and verify log

Any background context you want to provide?

What are the relevant tickets?

Screenshots

Checklist:

Notes on Review Process

Please see Notes on Review Process for further guidance on requirements for merging and abbreviated reviews.

Review Comment Legend:

  • ✏️ (Pencil) This comment is a nitpick or style suggestion, no action required for approval. This comment should provide a suggestion either as an in line code snippet or a gist.
  • ❓ (Question Mark) This comment is to gain a clearer understanding of design or code choices, clarification is required but action may not be necessary for approval.
  • ❗ (Exclamation Mark) This comment is critical and requires clarification or action before approval.

josephthweatt and others added 5 commits December 2, 2020 10:15
@josephthweatt @aaronilovici
DDF-6408 Improve Logging for CDM (codice#6064) (codice#6122)
0d9d4df
@emmberk @aaronilovici
Update the contentDirectoryMonitor appender configuration in org.ops4…
41391fb 
…j.pax.logging.cfg to match log4j2.xml (codice#6344)
@josephthweatt @aaronilovici
Cdm Set Max File Size (codice#6358)
07e90e2 
* Fix create commit before ingest

* Set max file size for in place directory monitoring to 1GB and made configurable
@clockard @josephthweatt @aaronilovici
CDM timeout update (codice#6339)
0059d42 
* DDF-6334 added logging & camel will expire messages. Also set max number of threads for CDM

* Update FrameworkProducer and TransformProducer to support timeouts

* Update CDM timeouts to use camel component timeouts

* Add failure retry

* Camel component test updates

Co-authored-by: Joseph Thweatt <joseph.thweatt@connexta.com>
@aaronilovici
Cleanup
1cf3c39
@aaronilovici
Copy link
Contributor Author

build now

@cxddfbot
Copy link

cxddfbot commented Dec 3, 2020

Internal build has been started, your results will be available at build completion.

@cxddfbot
Copy link

cxddfbot commented Dec 3, 2020

Build FAILURE See the job results in legacy Jenkins UI or in Blue Ocean UI.

@aaronilovici
Copy link
Contributor Author

build now

@cxddfbot
Copy link

cxddfbot commented Dec 3, 2020

Internal build has been started, your results will be available at build completion.

@aaronilovici
Copy link
Contributor Author

build now

@cxddfbot
Copy link

cxddfbot commented Dec 7, 2020

Internal build has been started, your results will be available at build completion.

@cxddfbot
Copy link

cxddfbot commented Dec 7, 2020

Build FAILURE See the job results in legacy Jenkins UI or in Blue Ocean UI.

@aaronilovici
Copy link
Contributor Author

build now

@cxddfbot
Copy link

cxddfbot commented Dec 7, 2020

Internal build has been started, your results will be available at build completion.

@aaronilovici
Copy link
Contributor Author

build now

@cxddfbot
Copy link

cxddfbot commented Dec 7, 2020

Build ABORTED See the job results in legacy Jenkins UI or in Blue Ocean UI.

@cxddfbot
Copy link

cxddfbot commented Dec 7, 2020

Internal build has been started, your results will be available at build completion.

@cxddfbot
Copy link

cxddfbot commented Dec 7, 2020

Build FAILURE See the job results in legacy Jenkins UI or in Blue Ocean UI.

@aaronilovici
Copy link
Contributor Author

build now

@cxddfbot
Copy link

cxddfbot commented Dec 7, 2020

Internal build has been started, your results will be available at build completion.

@cxddfbot
Copy link

cxddfbot commented Dec 7, 2020

Build SUCCESS See the job results in legacy Jenkins UI or in Blue Ocean UI.

@figliold figliold merged commit 28bb9aa into codice:2.26.x Dec 8, 2020
alexabird added a commit that referenced this pull request Aug 8, 2024
@alexabird
Revert "Port CDM updates to 2.26.x branch (#6434)"
9dddd93 
This reverts commit 28bb9aa.
@malmgrens4 malmgrens4 mentioned this pull request Oct 31, 2024
Merged
4 tasks
malmgrens4 added a commit that referenced this pull request Nov 7, 2024
@malmgrens4 @aaronilovici
[2.29.x] Forward ports from 2.26 for content directory monitor (#6810)
cdf8205 
* content directory monitor forward ports

* destroy param

* Port CDM updates to 2.26.x branch
9dddd93
#6434

* CDM fix for binding system subject to thread
d1da443
#6547

---------

Co-authored-by: Aaron Ilovici <aaron.ilovici@connexta.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhunzik jhunzik jhunzik approved these changes

@clockard clockard clockard approved these changes

@figliold figliold figliold approved these changes

@stustison stustison Awaiting requested review from stustison stustison is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@aaronilovici @cxddfbot @figliold @clockard @jhunzik @josephthweatt @emmberk