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

BIGTOP-4122. Fix test failure of SparkR on openEuler due to lack of R deployment. #1277

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −22
Open

BIGTOP-4122. Fix test failure of SparkR on openEuler due to lack of R deployment. #1277

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
23 changes: 9 additions & 14 deletions bigtop-deploy/puppet/modules/spark/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,25 +162,20 @@
}

class sparkr {
# BIGTOP-3579. On these distros, the default version of R is earlier than 3.5.0,
# which is required to run SparkR. So the newer version of R is installed here.
if (($operatingsystem == 'Ubuntu' and versioncmp($operatingsystemmajrelease, '18.04') <= 0) or
($operatingsystem == 'Debian' and versioncmp($operatingsystemmajrelease, '10') < 0)) {
if ($operatingsystem == 'openEuler') {
$url = "http://cran.r-project.org/src/base/R-3/"
$rfile = "R-3.6.3.tar.gz"
$rdir = "R-3.6.3"

$pkgs = [
"g++",
"gcc",
"gfortran",
"libbz2-dev",
"libcurl4-gnutls-dev",
"liblzma-dev",
"libpcre3-dev",
"libreadline-dev",
"libz-dev",
"make",
"bzip2-devel",
"gcc-c++",
"gcc-gfortran",
"libcurl-devel",
"perl-Digest-SHA",
"pcre-devel",
"readline-devel",
"xz-devel",
]
package { $pkgs:
ensure => installed,
Expand Down
5 changes: 5 additions & 0 deletions bigtop-packages/src/rpm/spark/SPECS/spark.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,12 @@ Spark YARN Shuffle Service
%package -n %{spark_pkg_name}-sparkr
Summary: R package for Apache Spark
Group: Development/Libraries

%if 0%{?openEuler}
Requires: %{spark_pkg_name}-core = %{version}-%{release}
%else
Requires: %{spark_pkg_name}-core = %{version}-%{release}, R
%endif

%description -n %{spark_pkg_name}-sparkr
SparkR is an R package that provides a light-weight frontend to use Apache Spark from R.
Expand Down
9 changes: 1 addition & 8 deletions bigtop_toolchain/manifests/renv.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,7 @@
}
}


# BIGTOP-3483:
# Upgrade R version to 3.6.3 to build Spark 3.0.1 on Ubuntu 16.04 and 18.04
#
# Then Install required R packages dependency
if (($operatingsystem == 'Ubuntu' and versioncmp($operatingsystemmajrelease, '18.04') <= 0) or
($operatingsystem == 'Debian' and versioncmp($operatingsystemmajrelease, '10') <= 0) or
($operatingsystem == 'openEuler')) {
if ($operatingsystem == 'openEuler') {
$rurl = "https://cran.r-project.org/src/base/R-3/"
$rfile = "R-3.6.3.tar.gz"
$rdir = "R-3.6.3"
Expand Down