Skip to content

Commit e3fa281

Browse files
nschonniyungezz
nschonni
authored and
yungezz
committed
fix: hdinsights model validation (Azure#6920)
Add "body" for RESPONSE_BODY_NOT_IN_EXAMPLE errors
1 parent 4d10819 commit e3fa281

File tree

2 files changed

+135
-131
lines changed

2 files changed

+135
-131
lines changed

‎specification/hdinsight/data-plane/Microsoft.HDInsight/preview/2018-11-01-preview/examples/HDI_Job_Get.json‎

Lines changed: 63 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -7,70 +7,72 @@
77
},
88
"responses": {
99
"200": {
10-
"status": {
11-
"mapProgress": 1.0,
12-
"reduceProgress": 1.0,
13-
"cleanupProgress": 0.0,
14-
"setupProgress": 0.0,
15-
"runState": 2,
16-
"startTime": 1542088206436,
17-
"queue": "default",
18-
"priority": "NORMAL",
19-
"schedulingInfo": "NA",
20-
"failureInfo": "NA",
21-
"jobACLs": {},
22-
"jobName": "TempletonControllerJob",
23-
"jobFile": "wasb://testcontainer11549@testazureblob1114.blob.core.windows.net/mr-history/done/2018/11/13/000000/job_1542085634998_0024_conf.xml",
24-
"finishTime": 1542088277769,
25-
"historyFile": "",
26-
"trackingUrl": "hn1-testcl.422g4qa5a0lehgxxtnagxxuu2h.ex.internal.cloudapp.net:19888/jobhistory/job/job_1542085634998_0024",
27-
"numUsedSlots": 0,
28-
"numReservedSlots": 0,
29-
"usedMem": 0,
30-
"reservedMem": 0,
31-
"neededMem": 0,
32-
"jobPriority": "NORMAL",
33-
"jobID": {
34-
"id": 24,
35-
"jtIdentifier": "1542085634998"
10+
"body": {
11+
"status": {
12+
"mapProgress": 1.0,
13+
"reduceProgress": 1.0,
14+
"cleanupProgress": 0.0,
15+
"setupProgress": 0.0,
16+
"runState": 2,
17+
"startTime": 1542088206436,
18+
"queue": "default",
19+
"priority": "NORMAL",
20+
"schedulingInfo": "NA",
21+
"failureInfo": "NA",
22+
"jobACLs": {},
23+
"jobName": "TempletonControllerJob",
24+
"jobFile": "wasb://testcontainer11549@testazureblob1114.blob.core.windows.net/mr-history/done/2018/11/13/000000/job_1542085634998_0024_conf.xml",
25+
"finishTime": 1542088277769,
26+
"historyFile": "",
27+
"trackingUrl": "hn1-testcl.422g4qa5a0lehgxxtnagxxuu2h.ex.internal.cloudapp.net:19888/jobhistory/job/job_1542085634998_0024",
28+
"numUsedSlots": 0,
29+
"numReservedSlots": 0,
30+
"usedMem": 0,
31+
"reservedMem": 0,
32+
"neededMem": 0,
33+
"jobPriority": "NORMAL",
34+
"jobID": {
35+
"id": 24,
36+
"jtIdentifier": "1542085634998"
37+
},
38+
"jobId": "job_1542085634998_0024",
39+
"username": "testuser11750",
40+
"state": "SUCCEEDED",
41+
"retired": false,
42+
"jobComplete": true,
43+
"uber": false
3644
},
37-
"jobId": "job_1542085634998_0024",
38-
"username": "testuser11750",
39-
"state": "SUCCEEDED",
40-
"retired": false,
41-
"jobComplete": true,
42-
"uber": false
43-
},
44-
"profile": {
45-
"user": "testuser11750",
46-
"jobFile": "wasb://testcontainer11549@testazureblob1114.blob.core.windows.net/mr-history/done/2018/11/13/000000/job_1542085634998_0024_conf.xml",
47-
"url": null,
48-
"queueName": "default",
49-
"jobName": "TempletonControllerJob",
50-
"jobID": {
51-
"id": 24,
52-
"jtIdentifier": "1542085634998"
45+
"profile": {
46+
"user": "testuser11750",
47+
"jobFile": "wasb://testcontainer11549@testazureblob1114.blob.core.windows.net/mr-history/done/2018/11/13/000000/job_1542085634998_0024_conf.xml",
48+
"url": null,
49+
"queueName": "default",
50+
"jobName": "TempletonControllerJob",
51+
"jobID": {
52+
"id": 24,
53+
"jtIdentifier": "1542085634998"
54+
},
55+
"jobId": "job_1542085634998_0024"
5356
},
54-
"jobId": "job_1542085634998_0024"
55-
},
56-
"id": "job_1542085634998_0024",
57-
"parentId": null,
58-
"percentComplete": null,
59-
"exitValue": 0,
60-
"user": "testuser11750",
61-
"callback": null,
62-
"completed": "done",
63-
"userargs": {
64-
"statusdir": "2018-11-13T05-49-52-4418fce1-e92e-4732-bc12-f2a3b8ef4432",
65-
"file": null,
66-
"enablejobreconnect": null,
67-
"define": [],
68-
"enablelog": "false",
69-
"files": null,
57+
"id": "job_1542085634998_0024",
58+
"parentId": null,
59+
"percentComplete": null,
60+
"exitValue": 0,
61+
"user": "testuser11750",
7062
"callback": null,
71-
"execute": "select querydwelltime+2 from hivesampletable where clientid = 8"
72-
},
73-
"msg": null
63+
"completed": "done",
64+
"userargs": {
65+
"statusdir": "2018-11-13T05-49-52-4418fce1-e92e-4732-bc12-f2a3b8ef4432",
66+
"file": null,
67+
"enablejobreconnect": null,
68+
"define": [],
69+
"enablelog": "false",
70+
"files": null,
71+
"callback": null,
72+
"execute": "select querydwelltime+2 from hivesampletable where clientid = 8"
73+
},
74+
"msg": null
75+
}
7476
}
7577
}
7678
}

‎specification/hdinsight/data-plane/Microsoft.HDInsight/preview/2018-11-01-preview/examples/HDI_Job_Kill.json‎

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -6,79 +6,81 @@
66
},
77
"responses": {
88
"200": {
9-
"status": {
10-
"mapProgress": 0.0,
11-
"reduceProgress": 0.0,
12-
"cleanupProgress": 0.0,
13-
"setupProgress": 0.0,
14-
"runState": 5,
15-
"startTime": 1542087304445,
16-
"queue": "default",
17-
"priority": "NORMAL",
18-
"schedulingInfo": "NA",
19-
"failureInfo": "NA",
20-
"jobACLs": {},
21-
"jobName": "TempletonControllerJob",
22-
"jobFile": "/mapreducestaging/testuser11750/.staging/job_1542085634998_0007/job.xml",
23-
"finishTime": 1542087305443,
24-
"historyFile": "",
25-
"trackingUrl": "http://hn0-testcl.422g4qa5a0lehgxxtnagxxuu2h.ex.internal.cloudapp.net:8088/cluster/app/application_1542085634998_0007",
26-
"numUsedSlots": 0,
27-
"numReservedSlots": 0,
28-
"usedMem": 0,
29-
"reservedMem": 0,
30-
"neededMem": 0,
31-
"jobPriority": "NORMAL",
32-
"jobID": {
33-
"id": 7,
34-
"jtIdentifier": "1542085634998"
9+
"body": {
10+
"status": {
11+
"mapProgress": 0.0,
12+
"reduceProgress": 0.0,
13+
"cleanupProgress": 0.0,
14+
"setupProgress": 0.0,
15+
"runState": 5,
16+
"startTime": 1542087304445,
17+
"queue": "default",
18+
"priority": "NORMAL",
19+
"schedulingInfo": "NA",
20+
"failureInfo": "NA",
21+
"jobACLs": {},
22+
"jobName": "TempletonControllerJob",
23+
"jobFile": "/mapreducestaging/testuser11750/.staging/job_1542085634998_0007/job.xml",
24+
"finishTime": 1542087305443,
25+
"historyFile": "",
26+
"trackingUrl": "http://hn0-testcl.422g4qa5a0lehgxxtnagxxuu2h.ex.internal.cloudapp.net:8088/cluster/app/application_1542085634998_0007",
27+
"numUsedSlots": 0,
28+
"numReservedSlots": 0,
29+
"usedMem": 0,
30+
"reservedMem": 0,
31+
"neededMem": 0,
32+
"jobPriority": "NORMAL",
33+
"jobID": {
34+
"id": 7,
35+
"jtIdentifier": "1542085634998"
36+
},
37+
"jobId": "job_1542085634998_0007",
38+
"username": "testuser11750",
39+
"state": "KILLED",
40+
"retired": false,
41+
"jobComplete": true,
42+
"uber": false
3543
},
36-
"jobId": "job_1542085634998_0007",
37-
"username": "testuser11750",
38-
"state": "KILLED",
39-
"retired": false,
40-
"jobComplete": true,
41-
"uber": false
42-
},
43-
"profile": {
44-
"user": "testuser11750",
45-
"jobFile": "/mapreducestaging/testuser11750/.staging/job_1542085634998_0007/job.xml",
46-
"url": "http://hn0-testcl.422g4qa5a0lehgxxtnagxxuu2h.ex.internal.cloudapp.net:8088/cluster/app/application_1542085634998_0007",
47-
"queueName": "default",
48-
"jobName": "TempletonControllerJob",
49-
"jobID": {
50-
"id": 7,
51-
"jtIdentifier": "1542085634998"
44+
"profile": {
45+
"user": "testuser11750",
46+
"jobFile": "/mapreducestaging/testuser11750/.staging/job_1542085634998_0007/job.xml",
47+
"url": "http://hn0-testcl.422g4qa5a0lehgxxtnagxxuu2h.ex.internal.cloudapp.net:8088/cluster/app/application_1542085634998_0007",
48+
"queueName": "default",
49+
"jobName": "TempletonControllerJob",
50+
"jobID": {
51+
"id": 7,
52+
"jtIdentifier": "1542085634998"
53+
},
54+
"jobId": "job_1542085634998_0007"
5255
},
53-
"jobId": "job_1542085634998_0007"
54-
},
55-
"id": "job_1542085634998_0007",
56-
"parentId": null,
57-
"percentComplete": null,
58-
"exitValue": null,
59-
"user": "testuser11750",
60-
"callback": null,
61-
"completed": null,
62-
"userargs": {
63-
"statusdir": "2018-11-13T05-35-01-6f79af0f-6157-494a-a03e-eabb190a0c10",
64-
"enablejobreconnect": null,
65-
"arg": [
66-
"10",
67-
"1000"
68-
],
69-
"define": [
70-
"mapreduce.map.maxattempts=10",
71-
"mapreduce.reduce.maxattempts=10",
72-
"mapreduce.task.timeout=60000"
73-
],
74-
"enablelog": "false",
75-
"libjars": null,
76-
"files": null,
56+
"id": "job_1542085634998_0007",
57+
"parentId": null,
58+
"percentComplete": null,
59+
"exitValue": null,
60+
"user": "testuser11750",
7761
"callback": null,
78-
"jar": "/example/jars/hadoop-mapreduce-examples.jar",
79-
"class": "pi"
80-
},
81-
"msg": null
62+
"completed": null,
63+
"userargs": {
64+
"statusdir": "2018-11-13T05-35-01-6f79af0f-6157-494a-a03e-eabb190a0c10",
65+
"enablejobreconnect": null,
66+
"arg": [
67+
"10",
68+
"1000"
69+
],
70+
"define": [
71+
"mapreduce.map.maxattempts=10",
72+
"mapreduce.reduce.maxattempts=10",
73+
"mapreduce.task.timeout=60000"
74+
],
75+
"enablelog": "false",
76+
"libjars": null,
77+
"files": null,
78+
"callback": null,
79+
"jar": "/example/jars/hadoop-mapreduce-examples.jar",
80+
"class": "pi"
81+
},
82+
"msg": null
83+
}
8284
}
8385
}
8486
}

0 commit comments

Comments
 (0)