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.

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

Export jobs #718

Merged
merged 13 commits into from
Feb 8, 2018
Merged

Export jobs #718

merged 13 commits into from
Feb 8, 2018

Conversation

dmcassel
Copy link
Contributor

@dmcassel dmcassel commented Feb 5, 2018

No description provided.

@marklogic-builder
Copy link

Can one of the admins verify this patch?

1 similar comment
@marklogic-builder
Copy link

Can one of the admins verify this patch?

@marklogic-builder
Copy link

Jenkins Build failure
http://jenkins.marklogic.com/job/Labs/job/DHF_b9_nightly_linux_cluster/31/testReport

489 tests run, 0 skipped, 2 failed.

File zipFile = exportFilePath.toFile();
WriteToZipConsumer zipConsumer = new WriteToZipConsumer(zipFile);

String[] jobsArray = jobIds != null ? jobsArray = jobIds.split(",") : null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this work?

Shoudn't it be:

String[] jobsArray = jobIds != null ? jobIds.split(",") : null;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oddly, it appears to have worked, but I'll fix it

* Jobs app server, but pointing to the Traces database.
* @return
*/
private DatabaseClient getTraceDatabaseClient() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look at HubConfig.newTraceDbCient()

I put those new*Client() methods there so that we don't duplicate the creation code. Also, it handles SSL and stuff. This approach will likely fail for ssl.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I started with that, but the Trace app server uses a non-standard rewriter that doesn't include some hidden URLs. DMSDK failed because of that. We talked about re-copying the rewriter stuff, but that doesn't feel like a good approach long term.

Won't the jobClient.getSecurityContext() figure out the SSL situation?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that rewriter is moving into the server install dir and will be maintained like the regular rest rewriter. So we can count on it being ok. Erik says there is a magical tool that checks to make sure all the various rewriter*.xml files are in sync when a server build is created.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, cool. I'll update the writer for now and switch to using newTraceDbClient

@@ -38,7 +38,7 @@ abstract class HubTask extends DefaultTask {

@Internal
JobManager getJobManager() {
return new JobManager(getHubConfig().newJobDbClient());
return new JobManager(getHubConfig().newJobDbClient(), getHubConfig().newTraceDbClient());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above comment. This one is correct. it's using newTraceDbClient() from HubConfig

@marklogic-builder
Copy link

Jenkins Build failure
http://jenkins.marklogic.com/job/Labs/job/DHF_b9_nightly_linux_cluster/42/testReport

489 tests run, 0 skipped, 6 failed.

The tracing-rewriter was missing some internal endpoints, which
prevented some DMSDK calls from working.
Added .json/.xml extensions to trace documents.
@marklogic-builder
Copy link

Jenkins Build failure
http://jenkins.marklogic.com/job/Labs/job/DHF_b9_nightly_linux_cluster/57/testReport

484 tests run, 0 skipped, 2 failed.

@marklogic-builder
Copy link

Jenkins Build failure
http://jenkins.marklogic.com/job/Labs/job/DHF_b9_nightly_linux_cluster/58/testReport

1 tests run, 0 skipped, 1 failed.

@marklogic-builder
Copy link

Jenkins Build failure
http://jenkins.marklogic.com/job/Labs/job/DHF_b9_nightly_linux_cluster/62/testReport

489 tests run, 0 skipped, 2 failed.

@dmcassel
Copy link
Contributor Author

dmcassel commented Feb 8, 2018

The two failing tests are TracingTest ones that are passing locally but not in Jenkins.

@dmcassel
Copy link
Contributor Author

dmcassel commented Feb 8, 2018

@paxtonhare I think I've addressed your review comments. Please re-review

@dmcassel dmcassel merged commit 5de95ef into develop Feb 8, 2018
@dmcassel dmcassel deleted the export-jobs branch February 8, 2018 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants