diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 50a4da774758d41fa83fc5b9413160216b2f401c..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# percona-xtrabackup - -#### Description -Percona XtraBackup is an open-source hot backup utility for MySQL-based servers that doesn't lock the database during the backup. - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index e61a37daf7013b284d9a27df335357ef6b61d22c..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# percona-xtrabackup - -#### 介绍 -Percona XtraBackup is an open-source hot backup utility for MySQL-based servers that doesn't lock the database during the backup. - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/ambari.spec b/ambari.spec new file mode 100644 index 0000000000000000000000000000000000000000..1f545b8e0afc850a9d2cb6c7502b164977782b6d --- /dev/null +++ b/ambari.spec @@ -0,0 +1,36 @@ +Summary: A complex directed-acyclic-graph of tasks for processing data. +Name: ambari +Version: 2.7.6 +Release: 1 +License: Apache License v2.0 +URL: https://ambari.apache.org/ +# Source0: https://github.com/apache/ambari/archive/refs/tags/release-2.7.6.tar.gz +Source0: release-2.7.6.tar.gz +Patch0: ambari_fix.patch + +%global debug_package %{nil} + +BuildRequires: maven java-1.8.0-openjdk java-1.8.0-openjdk-devel +Requires: java-1.8.0-openjdk python3-devel +BuildArch: x86_64 aarch64 + +%description +Apache Ambari is a tool for provisioning, managing, and monitoring Apache Hadoop clusters. + +%prep +%autosetup -p1 -n %{name}-release-%{version} + +%build +mvn clean package -DskipTests -Drat.skip -nsu + +%install +mkdir -p %{buildroot}/opt/%{name}-release-%{version} +cp -rf ../%{name}-release-%{version}/ambari-server %{buildroot}/opt/%{name}-release-%{version} +exit 0 + +%files +/opt/%{name}-release-%{version} + +%changelog +* Fri Dec 3 2021 PengLei - 2.7.0-1 +- Init package diff --git a/ambari.yaml b/ambari.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3aa829c95b4e56a91558cb656900d8606652366f --- /dev/null +++ b/ambari.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: apache/ambari +tag_prefix: "release-" +separator: "." diff --git a/ambari_fix.patch b/ambari_fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..561d64e8b33d2033c94ca64151cca598ae16b258 --- /dev/null +++ b/ambari_fix.patch @@ -0,0 +1,611 @@ +diff -uprN ambari-release-2.7.6/ambari-admin/pom.xml ambari-release-2.7.6-test/ambari-admin/pom.xml +--- ambari-release-2.7.6/ambari-admin/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-admin/pom.xml 2021-12-10 02:28:56.974706262 +0000 +@@ -61,9 +61,10 @@ + + com.github.eirslett + frontend-maven-plugin +- 1.4 +- +- v4.5.0 ++ ${frontend-maven-plugin.version} ++ ++ ${ambari.web.skip} ++ v4.5.0 + v0.23.2 + src/main/resources/ui/admin-web/ + false +@@ -104,7 +105,8 @@ + exec + + +- ${basedir}/src/main/resources/ui/admin-web ++ ${ambari.web.skip} ++ ${basedir}/src/main/resources/ui/admin-web + ${basedir}/src/main/resources/ui/admin-web/node/${executable.node} + + ${basedir}/src/main/resources/ui/admin-web/node_modules/bower/bin/bower +@@ -120,7 +122,8 @@ + exec + + +- ${basedir}/src/main/resources/ui/admin-web ++ ${ambari.web.skip} ++ ${basedir}/src/main/resources/ui/admin-web + ${basedir}/src/main/resources/ui/admin-web/node/${executable.node} + + ${basedir}/src/main/resources/ui/admin-web/node_modules/gulp/bin/gulp +@@ -135,7 +138,8 @@ + exec + + +- ++ ${ambari.web.skip} ++ + ${executable.shell} + ${basedir} + ${args.shell} ${basedir}${dirsep}set-ambari-version.${fileextension.shell} ${ambariVersion} +@@ -149,7 +153,8 @@ + exec + + +- ${basedir}/src/main/resources/ui/admin-web ++ ${ambari.web.skip} ++ ${basedir}/src/main/resources/ui/admin-web + npm + + run +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py 2021-12-10 02:28:56.974706262 +0000 +@@ -143,7 +143,7 @@ class AmbariConfig: + else: + raise Exception("No config found at {0}, use default".format(configPath)) + +- except Exception, err: ++ except Exception as err: + logger.warn(err) + setattr(cls, "_conf_cache", config) + return config +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/Controller.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/Controller.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/Controller.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/Controller.py 2021-12-10 02:28:56.974706262 +0000 +@@ -269,7 +269,7 @@ class Controller(threading.Thread): + if commands: + try: + self.actionQueue.cancel(commands) +- except Exception, err: ++ except Exception as err: + logger.error("Exception occurred on commands cancel: %s", err.message) + + def addToQueue(self, commands): +@@ -476,7 +476,7 @@ class Controller(threading.Thread): + self.isRegistered = False + logger.exception("SSLError while trying to heartbeat.") + return +- except Exception, err: ++ except Exception as err: + if "code" in err: + logger.error(err.code) + else: +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/Facter.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/Facter.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/Facter.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/Facter.py 2021-12-10 02:28:56.974706262 +0000 +@@ -72,7 +72,7 @@ class Facter(object): + else: + raise Exception("No config found, use default") + +- except Exception, err: ++ except Exception as err: + log.warn(err) + return config + +@@ -495,7 +495,7 @@ class FacterLinux(Facter): + 0x8915, # SIOCGIFADDR + struct.pack('256s', ifname[:15]) + )[20:24]) +- except Exception, err: ++ except Exception as err: + log.warn("Can't get the IP address for {0}".format(ifname)) + + return ip_address_by_ifname +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py 2021-12-10 02:28:56.974706262 +0000 +@@ -54,7 +54,7 @@ class HostCheckReportFileHandler: + else: + raise Exception("No config found, use default") + +- except Exception, err: ++ except Exception as err: + logger.warn(err) + return config + +@@ -83,7 +83,7 @@ class HostCheckReportFileHandler: + self.touchFile(self.hostCheckCustomActionsFilePath) + with open(self.hostCheckCustomActionsFilePath, 'wb') as configfile: + config.write(configfile) +- except Exception, err: ++ except Exception as err: + logger.error("Can't write host check file at %s :%s " % (self.hostCheckCustomActionsFilePath, err.message)) + traceback.print_exc() + +@@ -168,7 +168,7 @@ class HostCheckReportFileHandler: + self.touchFile(self.hostCheckFilePath) + with open(self.hostCheckFilePath, 'wb') as configfile: + config.write(configfile) +- except Exception, err: ++ except Exception as err: + logger.error("Can't write host check file at %s :%s " % (self.hostCheckFilePath, err.message)) + traceback.print_exc() + +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/HostCleanup.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/HostCleanup.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/HostCleanup.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/HostCleanup.py 2021-12-10 02:28:56.974706262 +0000 +@@ -115,7 +115,7 @@ class HostCleanup: + else: + raise Exception("No config found, use default") + +- except Exception, err: ++ except Exception as err: + logger.warn(err) + return config + +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/hostname.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/hostname.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/hostname.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/hostname.py 2021-12-10 02:28:56.978706311 +0000 +@@ -122,7 +122,7 @@ def server_hostnames(config): + if (0 == osStat.returncode and 0 != len(out.strip())): + cached_server_hostnames = arrayFromCsvString(out) + logger.info("Read server hostname '" + cached_server_hostnames + "' using server:hostname_script") +- except Exception, err: ++ except Exception as err: + logger.info("Unable to execute hostname_script for server hostname. " + str(err)) + + if not cached_server_hostnames: +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/main.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/main.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/main.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/main.py 2021-12-10 02:28:56.978706311 +0000 +@@ -193,7 +193,7 @@ def update_log_level(config): + logging.basicConfig(format=formatstr, level=logging.INFO, filename=AmbariConfig.AmbariConfig.getLogFile()) + logger.setLevel(logging.INFO) + logger.debug("Newloglevel=logging.INFO") +- except Exception, err: ++ except Exception as err: + logger.info("Default loglevel=DEBUG") + + +@@ -212,7 +212,7 @@ def resolve_ambari_config(): + else: + raise Exception("No config found at {0}, use default".format(configPath)) + +- except Exception, err: ++ except Exception as err: + logger.warn(err) + + def check_sudo(): +@@ -310,7 +310,7 @@ def stop_agent(): + time.sleep(GRACEFUL_STOP_TRIES_SLEEP) + logger.info("Agent not going to die gracefully, going to execute kill -9") + raise Exception("Agent is running") +- except Exception, err: ++ except Exception as err: + #raise + if pid == -1: + print ("Agent process is not running") +@@ -345,7 +345,7 @@ def reset_agent(options): + os.remove(os.path.join(root, name)) + for name in dirs: + os.rmdir(os.path.join(root, name)) +- except Exception, err: ++ except Exception as err: + print("A problem occurred while trying to reset the agent: " + str(err)) + sys.exit(1) + +diff -uprN ambari-release-2.7.6/ambari-common/src/main/unix/ambari-python-wrap ambari-release-2.7.6-test/ambari-common/src/main/unix/ambari-python-wrap +--- ambari-release-2.7.6/ambari-common/src/main/unix/ambari-python-wrap 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-common/src/main/unix/ambari-python-wrap 2021-12-10 02:28:56.978706311 +0000 +@@ -17,7 +17,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-export PYTHONPATH=/usr/lib/python2.6/site-packages:/usr/lib/python2.6/site-packages/ambari_commons:$PYTHONPATH ++export PYTHONPATH=/usr/lib/python3.8/site-packages:/usr/lib/python3.8/site-packages/ambari_commons:$PYTHONPATH + + # checking for default Python 2 + if [ -a /usr/bin/python2 ] && [ -z "$PYTHON" ]; then +diff -uprN ambari-release-2.7.6/ambari-logsearch/ambari-logsearch-server/pom.xml ambari-release-2.7.6-test/ambari-logsearch/ambari-logsearch-server/pom.xml +--- ambari-release-2.7.6/ambari-logsearch/ambari-logsearch-server/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-logsearch/ambari-logsearch-server/pom.xml 2021-12-10 02:28:56.978706311 +0000 +@@ -124,7 +124,10 @@ + org.apache.maven.plugins + maven-antrun-plugin + 1.7 +- ++ ++ ${ambari.web.skip} ++ ++ + + package + +diff -uprN ambari-release-2.7.6/ambari-logsearch/ambari-logsearch-web/pom.xml ambari-release-2.7.6-test/ambari-logsearch/ambari-logsearch-web/pom.xml +--- ambari-release-2.7.6/ambari-logsearch/ambari-logsearch-web/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-logsearch/ambari-logsearch-web/pom.xml 2021-12-10 02:28:56.978706311 +0000 +@@ -38,9 +38,10 @@ + + com.github.eirslett + frontend-maven-plugin +- 1.6 +- +- ${node.version} ++ ${frontend-maven-plugin.version} ++ ++ ${ambari.web.skip} ++ ${node.version} + ${yarn.version} + ${project.build.directory}/webapp-build + false +@@ -57,6 +58,9 @@ + + install-node-and-yarn + ++ ++ ${ambari.web.skip} ++ + + + yarn install +@@ -65,7 +69,8 @@ + yarn + + +- install --ignore-engines --pure-lockfile ++ ${ambari.web.skip} ++ install --ignore-engines --pure-lockfile + + + +@@ -76,7 +81,8 @@ + + generate-resources + +- ++ ${ambari.web.skip} ++ + production + + ++ true ++ ++ ++ + +diff -uprN ambari-release-2.7.6/ambari-project/pom.xml ambari-release-2.7.6-test/ambari-project/pom.xml +--- ambari-release-2.7.6/ambari-project/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-project/pom.xml 2021-12-10 02:28:56.978706311 +0000 +@@ -30,6 +30,8 @@ + + 5.5.2 + ${project.parent.basedir} ++ ${skipTests} ++ 1.12.0 + 1.6.3 + 9.4.12.v20180830 + 1.0.0 +@@ -84,6 +86,18 @@ + + + ++ ++ non-x86_64 ++ ++ ++ !amd64 ++ ++ ++ ++ ++ true ++ ++ + + + +diff -uprN ambari-release-2.7.6/ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py ambari-release-2.7.6-test/ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py +--- ambari-release-2.7.6/ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py 2021-12-10 02:28:56.978706311 +0000 +@@ -145,7 +145,7 @@ class ResourceFilesKeeper(): + """ + try: + return self._list_metainfo_dirs(root_dir) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not list stacks: {0}".format(str(err))) + + def list_common_services(self, root_dir): +@@ -154,7 +154,7 @@ class ResourceFilesKeeper(): + """ + try: + return self._list_metainfo_dirs(root_dir) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not list common services: {0}".format(str(err))) + + def list_extensions(self, root_dir): +@@ -163,7 +163,7 @@ class ResourceFilesKeeper(): + """ + try: + return self._list_metainfo_dirs(root_dir) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not list extensions: {0}".format(str(err))) + + def update_directory_archive(self, directory): +@@ -217,7 +217,7 @@ class ResourceFilesKeeper(): + break + sha1.update(data) + return sha1.hexdigest() +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not calculate directory " + "hash: {0}".format(str(err))) + +@@ -232,7 +232,7 @@ class ResourceFilesKeeper(): + try: + with open(hash_file) as fh: + return fh.readline().strip() +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not read file {0} : {1}".format(hash_file, + str(err))) + else: +@@ -249,7 +249,7 @@ class ResourceFilesKeeper(): + with open(hash_file, "w") as fh: + fh.write(new_hash) + os.chmod(hash_file, 0o644) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not write to file {0} : {1}".format(hash_file, + str(err))) + +@@ -279,7 +279,7 @@ class ResourceFilesKeeper(): + zf.write(absname, arcname) + zf.close() + os.chmod(zip_file_path, 0o755) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not create zip archive of " + "directory {0} : {1}".format(directory, str(err))) + +@@ -296,7 +296,7 @@ class ResourceFilesKeeper(): + if self.DEBUG: + sys.stderr.write("{0}\n".format(text)) + if not self.DEBUG and self.verbose: +- print text ++ print(text) + + + def main(argv=None): +diff -uprN ambari-release-2.7.6/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java ambari-release-2.7.6-test/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java +--- ambari-release-2.7.6/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java 2021-12-10 02:28:56.978706311 +0000 +@@ -531,7 +531,7 @@ public class RootServiceComponentConfigu + expect(configuration.isMasterKeyPersisted()).andReturn(false).once(); + expect(configuration.getMasterKeyStoreLocation()).andReturn(masterKeyStoreLocation).once(); + CredentialProvider credentialProvider = PowerMock.createMock(CredentialProvider.class); +- PowerMock.expectNew(CredentialProvider.class, null, null, masterKeyLocation, false, masterKeyStoreLocation, null).andReturn(credentialProvider); ++ PowerMock.expectNew(CredentialProvider.class, null, null, masterKeyLocation, false, masterKeyStoreLocation).andReturn(credentialProvider); + credentialProvider.addAliasToCredentialStore("currentPasswd", "newPasswd"); + PowerMock.expectLastCall().once(); + PowerMock.replay(credentialProvider, CredentialProvider.class); +@@ -631,4 +631,4 @@ public class RootServiceComponentConfigu + } + }); + } +-} +\ No newline at end of file ++} +diff -uprN ambari-release-2.7.6/ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java ambari-release-2.7.6-test/ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java +--- ambari-release-2.7.6/ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java 2021-12-10 02:28:56.978706311 +0000 +@@ -124,7 +124,7 @@ public class PasswordUtilsTest extends E + expect(configuration.getMasterKeyLocation()).andReturn(masterKeyLocation).once(); + expect(configuration.isMasterKeyPersisted()).andReturn(false).once(); + expect(configuration.getMasterKeyStoreLocation()).andReturn(masterKeyStoreLocation).once(); +- PowerMock.expectNew(CredentialProvider.class, null, null, masterKeyLocation, false, masterKeyStoreLocation, null).andReturn(credentialProvider); ++ PowerMock.expectNew(CredentialProvider.class, null, null, masterKeyLocation, false, masterKeyStoreLocation).andReturn(credentialProvider); + } + + private Injector createInjector() { +diff -uprN ambari-release-2.7.6/ambari-web/pom.xml ambari-release-2.7.6-test/ambari-web/pom.xml +--- ambari-release-2.7.6/ambari-web/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-web/pom.xml 2021-12-10 02:28:56.978706311 +0000 +@@ -90,9 +90,10 @@ + + com.github.eirslett + frontend-maven-plugin +- 1.4 +- +- v4.5.0 ++ ${frontend-maven-plugin.version} ++ ++ ${ambari.web.skip} ++ v4.5.0 + v0.23.2 + ${basedir} + false +@@ -108,7 +109,10 @@ + generate-sources + + install-node-and-yarn +- ++ ++ ++ ${ambari.web.skip} ++ + + + yarn install +@@ -117,7 +121,8 @@ + yarn + + +- install --ignore-engines --pure-lockfile ++ ${ambari.web.skip} ++ install --ignore-engines --pure-lockfile + + + +@@ -134,7 +139,8 @@ + exec + + +- ${executable.rmdir} ++ ${ambari.web.skip} ++ ${executable.rmdir} + ${basedir} + ${args.rm.clean} public ${nodemodules.dir} + +@@ -151,7 +157,8 @@ + exec + + +- ${executable.mkdir} ++ ${ambari.web.skip} ++ ${executable.mkdir} + ${basedir} + ${args.mkdir} public + +@@ -163,7 +170,8 @@ + exec + + +- ${basedir} ++ ${ambari.web.skip} ++ ${basedir} + ${basedir}/node/${node.executable} + + node_modules/brunch/bin/brunch +@@ -178,7 +186,8 @@ + exec + + +- ++ ${ambari.web.skip} ++ + ${executable.shell} + ${basedir} + ${args.shell} ${basedir}${dirsep}set-ambari-version.${fileextension.shell} ${ambariVersion} +@@ -217,8 +226,8 @@ + exec + + +- ${skipTests} +- ${executable.npm} ++ ${ambari.web.skip} ++ ${executable.npm} + ${basedir} + ${args.npm} test + +@@ -237,7 +246,8 @@ + run + + +- ++ ${ambari.web.skip} ++ + + + +diff -uprN ambari-release-2.7.6/pom.xml ambari-release-2.7.6-test/pom.xml +--- ambari-release-2.7.6/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/pom.xml 2021-12-10 02:29:27.711087400 +0000 +@@ -102,49 +102,6 @@ + + + +- +- +- oss.sonatype.org +- OSS Sonatype Staging +- https://oss.sonatype.org/content/groups/staging +- +- +- spring-milestones +- Spring Milestones +- https://repo.spring.io/milestone +- +- false +- +- +- +- ASF Staging +- https://repository.apache.org/content/groups/staging/ +- +- +- ASF Snapshots +- https://repository.apache.org/content/repositories/snapshots/ +- +- true +- +- +- false +- +- +- +- +- private-nexus +- private-nexus +- https://nexus-private.hortonworks.com/nexus/content/groups/public/ +- +- true +- +- +- true +- +- +- +- +- + + + diff --git a/compilec-fix.patch b/compilec-fix.patch deleted file mode 100644 index 6337019d7274e6803d68a5c442fd8a1e4f3d032c..0000000000000000000000000000000000000000 --- a/compilec-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruNa percona-xtrabackup-percona-xtrabackup-2.3.6/cmake/build_configurations/compiler_options.cmake percona-xtrabackup-percona-xtrabackup-2.3.6_patched/cmake/build_configurations/compiler_options.cmake ---- percona-xtrabackup-percona-xtrabackup-2.3.6/cmake/build_configurations/compiler_options.cmake 2016-11-25 17:05:53.000000000 +0800 -+++ percona-xtrabackup-percona-xtrabackup-2.3.6_patched/cmake/build_configurations/compiler_options.cmake 2021-07-16 21:10:47.260642064 +0800 -@@ -25,7 +25,7 @@ - - # Default GCC flags - IF(CMAKE_COMPILER_IS_GNUCC) -- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -Wno-implicit-fallthrough -Wno-stringop-truncation -Wno-stringop-overflow") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") diff --git a/gcc-10-cflags-fix.patch b/gcc-10-cflags-fix.patch deleted file mode 100644 index 641390d68cc196cd2f066322b55d30a9943855d3..0000000000000000000000000000000000000000 --- a/gcc-10-cflags-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruNa percona-xtrabackup-percona-xtrabackup-2.3.6/cmake/build_configurations/compiler_options.cmake percona-xtrabackup-percona-xtrabackup-2.3.6_patched/cmake/build_configurations/compiler_options.cmake ---- percona-xtrabackup-percona-xtrabackup-2.3.6/cmake/build_configurations/compiler_options.cmake 2021-08-02 10:04:35.684407534 +0800 -+++ percona-xtrabackup-percona-xtrabackup-2.3.6_patched/cmake/build_configurations/compiler_options.cmake 2021-08-02 10:05:25.068932898 +0800 -@@ -25,7 +25,7 @@ - - # Default GCC flags - IF(CMAKE_COMPILER_IS_GNUCC) -- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -Wno-implicit-fallthrough -Wno-stringop-truncation -Wno-stringop-overflow") -+ SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -Wno-implicit-fallthrough -Wno-stringop-truncation -Wno-stringop-overflow -fcommon") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") diff --git a/gcc-7-flags-fix.patch b/gcc-7-flags-fix.patch deleted file mode 100644 index 4fe57da0678715bcad6013b883eda975ef1f8abd..0000000000000000000000000000000000000000 --- a/gcc-7-flags-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/build_configurations/compiler_options.cmake 2021-07-16 04:05:53.000000000 -0500 -+++ b/cmake/build_configurations/compiler_options.cmake 2021-07-16 12:20:04.708833670 -0500 -@@ -34,7 +34,7 @@ - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) -- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") diff --git a/percona-xtrabackup.spec b/percona-xtrabackup.spec deleted file mode 100644 index cc34c815b4d9dd2c5aed92f1cb646a4ca26e66f7..0000000000000000000000000000000000000000 --- a/percona-xtrabackup.spec +++ /dev/null @@ -1,105 +0,0 @@ -Name: percona-xtrabackup -Summary: Online backup for InnoDB/XtraDB in MySQL, Percona Server and MariaDB -Version: 2.3.6 -Release: 2 -License: GPLv2 -URL: http://www.percona.com/software/percona-xtrabackup/ -Source: percona-xtrabackup-%{version}.tar.gz -Patch1: gcc-7-flags-fix.patch -Patch2: compilec-fix.patch -Patch3: gcc-10-cflags-fix.patch - -Provides: %{name} - -BuildRequires: automake -BuildRequires: cmake >= 2.6.3 -BuildRequires: patch -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: libtool - -BuildRequires: perl-generators -BuildRequires: procps -BuildRequires: python-sphinx - -BuildRequires: vim-common -BuildRequires: bison -BuildRequires: ncurses-devel -BuildRequires: openssl-devel -BuildRequires: libaio-devel -BuildRequires: libgcrypt-devel -BuildRequires: libcurl-devel -BuildRequires: libev-devel -Requires: perl(DBD::mysql) -Requires: libcurl -Requires: libev - -%description -Online backup for InnoDB/XtraDB in MySQL, MariaDB and Percona Server. - -%package test -Summary: Test suite for Percona Xtrabackup -Provides: %{name}-test -Requires: %{name} -Requires: /usr/bin/mysql -Requires: %{name} = %{version}-%{release} - -%description test -This package contains the test suite for Percona Xtrabackup - -%prep -%setup -qn %{name}-%{name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - - -%build -cmake -DBUILD_CONFIG=xtrabackup_release && make %{?_smp_mflags} - -%install -[ "%{buildroot}" != '/' ] && rm -rf %{buildroot} -install -d %{buildroot}%{_bindir} -install -d %{buildroot}%{_datadir} -install -d %{buildroot}%{_mandir}/man1 -# install binaries and configs - -SRC_DIR=storage/innobase/xtrabackup/src -pushd . -cd $SRC_DIR -install -p -m 755 xtrabackup %{buildroot}%{_bindir} -ln -sf xtrabackup %{buildroot}%{_bindir}/innobackupex -install -p -m 755 xbstream %{buildroot}%{_bindir} -install -p -m 755 xbcrypt %{buildroot}%{_bindir} -cd .. -find test -size 0 -delete -cp -pR test %{buildroot}%{_datadir}/percona-xtrabackup-test -rm -rf %{buildroot}%{_datadir}/percona-xtrabackup-test/kewpie -rm -rf %{buildroot}%{_datadir}/percona-xtrabackup-test/*Make* -cd doc/source/build/man -install -m 644 *.1 %{buildroot}%{_mandir}/man1 - -popd - -%files -%{_bindir}/innobackupex -%{_bindir}/xtrabackup -%{_bindir}/xbstream -%{_bindir}/xbcrypt -%doc COPYING README VERSION -%{_mandir}/man1/innobackupex.1.gz -%{_mandir}/man1/xtrabackup.1.gz -%{_mandir}/man1/xbstream.1.gz -%{_mandir}/man1/xbcrypt.1.gz - -%files -n percona-xtrabackup-test -%{_datadir}/percona-xtrabackup-test -%doc COPYING - -%changelog -* Mon Aug 2 2021 bzhaoop - 2.3.6-2 -- Fix gcc 10 compiling issue - -* Mon Jul 26 2021 bzhaoop - 2.3.6-1 -- Init project for percona-xtrabackup - diff --git a/percona-xtrabackup.yaml b/percona-xtrabackup.yaml deleted file mode 100644 index 6e915854ce71cd02caa29143bd30417e3ea1ffe9..0000000000000000000000000000000000000000 --- a/percona-xtrabackup.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: git -src_repo: https://github.com/percona/percona-xtrabackup -tag_prefix: "" -separator: "." diff --git a/percona-xtrabackup-2.3.6.tar.gz b/release-2.7.6.tar.gz similarity index 38% rename from percona-xtrabackup-2.3.6.tar.gz rename to release-2.7.6.tar.gz index ae4809c7888d7604f77fe8b0f06772193ad76092..54954dd8187589d4b71522942d50e074bc53defb 100644 Binary files a/percona-xtrabackup-2.3.6.tar.gz and b/release-2.7.6.tar.gz differ