Skip to content

Commit b2b1963

Browse files
Added docker command to download and install visual C++ 2010 Redistributable package
1 parent 168b7f9 commit b2b1963

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

dev-support/docker/Dockerfile_windows_10

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ RUN powershell pkg-resolver\install-python.ps1
119119
RUN powershell pkg-resolver\install-pip.ps1
120120
RUN powershell pip install python-dateutil
121121

122+
## Install the Microsoft Visual C++ 2010 Redistributable to link leveldbjni native library
123+
RUN powershell -Command Invoke-WebRequest -Uri https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe -OutFile vcredist_x64.exe
124+
RUN powershell -Command Start-Process -FilePath .\vcredist_x64.exe -ArgumentList '/quiet', '/norestart' -Wait
125+
RUN powershell -Command Remove-Item vcredist_x64.exe
126+
122127
# Create a user HadoopBuilder with basic privileges and use it for building Hadoop on Windows.
123128
RUN powershell New-LocalUser -Name 'HadoopBuilder' -Description 'User account for building Apache Hadoop' -Password ([securestring]::new()) -AccountNeverExpires -PasswordNeverExpires
124129

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestCombinedSystemMetricsPublisher.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,6 @@ private static YarnConfiguration getConf(boolean v1Enabled,
194194
boolean v2Enabled) {
195195
YarnConfiguration yarnConf = new YarnConfiguration();
196196

197-
// Always set memory store implementations regardless of whether service is enabled
198-
yarnConf.setClass(YarnConfiguration.TIMELINE_SERVICE_STORE,
199-
MemoryTimelineStore.class, TimelineStore.class);
200-
yarnConf.setClass(YarnConfiguration.TIMELINE_SERVICE_STATE_STORE_CLASS,
201-
MemoryTimelineStateStore.class, TimelineStateStore.class);
202-
203-
204197
if (v1Enabled || v2Enabled) {
205198
yarnConf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
206199
} else {
@@ -209,6 +202,10 @@ private static YarnConfiguration getConf(boolean v1Enabled,
209202

210203
if (v1Enabled) {
211204
yarnConf.set(YarnConfiguration.TIMELINE_SERVICE_VERSION, "1.0");
205+
yarnConf.setClass(YarnConfiguration.TIMELINE_SERVICE_STORE,
206+
MemoryTimelineStore.class, TimelineStore.class);
207+
yarnConf.setClass(YarnConfiguration.TIMELINE_SERVICE_STATE_STORE_CLASS,
208+
MemoryTimelineStateStore.class, TimelineStateStore.class);
212209
}
213210

214211
if (v2Enabled) {

0 commit comments

Comments
 (0)