Skip to content

[7.x] [Code] Use seq_no and primary_term to do ES concurrency control for EsQueue and reenable code tests (#41377) #41398

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

Merged
merged 1 commit into from
Jul 17, 2019
Merged

[7.x] [Code] Use seq_no and primary_term to do ES concurrency control for EsQueue and reenable code tests (#41377) #41398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions x-pack/legacy/plugins/code/server/lib/esqueue/worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const puid = new Puid();
function formatJobObject(job) {
return {
index: job._index,
type: job._type,
id: job._id,
// Expose the payload of the job even when the job failed/timeout
...job._source.payload,
Expand Down Expand Up @@ -125,9 +124,9 @@ export class Worker extends events.EventEmitter {

return this.client.update({
index: job._index,
type: job._type,
id: job._id,
version: job._version,
if_seq_no: job._seq_no,
if_primary_term: job._primary_term,
body: { doc }
})
.then((response) => {
Expand Down Expand Up @@ -168,9 +167,9 @@ export class Worker extends events.EventEmitter {

return this.client.update({
index: job._index,
type: job._type,
id: job._id,
version: job._version,
if_seq_no: job._seq_no,
if_primary_term: job._primary_term,
body: { doc }
})
.then(() => true)
Expand All @@ -193,7 +192,6 @@ export class Worker extends events.EventEmitter {

return this.client.update({
index: job._index,
type: job._type,
id: job._id,
version: job._version,
body: { doc }
Expand Down Expand Up @@ -276,9 +274,9 @@ export class Worker extends events.EventEmitter {

return this.client.update({
index: job._index,
type: job._type,
id: job._id,
version: job._version,
if_seq_no: job._seq_no,
if_primary_term: job._primary_term,
body: { doc }
})
.then(() => {
Expand Down Expand Up @@ -425,6 +423,7 @@ export class Worker extends events.EventEmitter {
_getPendingJobs() {
const nowTime = moment().toISOString();
const query = {
seq_no_primary_term: true,
_source: {
excludes: [ 'output.content' ]
},
Expand Down
3 changes: 1 addition & 2 deletions x-pack/test/api_integration/apis/code/repo_status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ export default function repoStatusTests({ getService }: KibanaFunctionalTestDefa
const TEST_REPO = 'github.com/elastic/TypeScript-Node-Starter';
const TEST_REPO_URL = `https://${TEST_REPO}.git`;

// FAILING: https://github.com/elastic/kibana/issues/41336
describe.skip('repo status', () => {
describe('repo status', () => {
after(async () => {
await supertest
.delete(`${DELETE_API}/${TEST_REPO}`)
Expand Down
3 changes: 1 addition & 2 deletions x-pack/test/functional/apps/code/explore_repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ export default function exploreRepositoryFunctionalTests({

const FIND_TIME = config.get('timeouts.find');

// FAILING: https://github.com/elastic/kibana/issues/41338
describe.skip('Explore Repository', function() {
describe('Explore Repository', function() {
this.tags('smoke');
describe('Explore a repository', () => {
const repositoryListSelector = 'codeRepositoryList codeRepositoryItem';
Expand Down
3 changes: 1 addition & 2 deletions x-pack/test/functional/apps/code/manage_repositories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ export default function manageRepositoriesFunctionalTests({
const log = getService('log');
const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home']);

// FAILING: https://github.com/elastic/kibana/issues/41337
describe.skip('Manage Repositories', () => {
describe('Manage Repositories', () => {
const repositoryListSelector = 'codeRepositoryList codeRepositoryItem';

describe('Manage Repositories', () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default async function ({ readConfigFile }) {
resolve(__dirname, './apps/status_page'),
resolve(__dirname, './apps/timelion'),
resolve(__dirname, './apps/upgrade_assistant'),
// resolve(__dirname, './apps/code'),
resolve(__dirname, './apps/code'),
resolve(__dirname, './apps/visualize'),
resolve(__dirname, './apps/uptime'),
resolve(__dirname, './apps/saved_objects_management'),
Expand Down